Commit ed989581 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/71-cttc-separation-of-monitoring' into 'develop' 

Resolve "(CTTC) Separation of Monitoring"

See merge request !207
parents 074e7d1a 9375c692

deploy/all.sh

+4 −1
Original line number Diff line number Diff line
@@ -29,9 +29,12 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 
# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}



# Uncomment to activate Monitoring

# Uncomment to activate Monitoring (old)

#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"



# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"

deploy/kafka.sh

0 → 100755
+69 −0
Original line number Diff line number Diff line 
#!/bin/bash

# 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.



########################################################################################################################

# Read deployment settings

########################################################################################################################



# If not already set, set the namespace where Apache Kafka will be deployed.

export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}





########################################################################################################################

# Automated steps start here

########################################################################################################################



# Constants

TMP_FOLDER="./tmp"

KFK_MANIFESTS_PATH="manifests/kafka"

KFK_ZOOKEEPER_MANIFEST="01-zookeeper.yaml"

KFK_MANIFEST="02-kafka.yaml"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${KFK_NAMESPACE}/manifests"

mkdir -p ${TMP_MANIFESTS_FOLDER}



# copy zookeeper and kafka manifest files to temporary manifest location

cp "${KFK_MANIFESTS_PATH}/${KFK_ZOOKEEPER_MANIFEST}" "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"

cp "${KFK_MANIFESTS_PATH}/${KFK_MANIFEST}" "${TMP_MANIFESTS_FOLDER}/${KFK_MANIFEST}"



echo "Apache Kafka Namespace"

echo ">>> Delete Apache Kafka Namespace"

kubectl delete namespace ${KFK_NAMESPACE} --ignore-not-found



echo ">>> Create Apache Kafka Namespace"

kubectl create namespace ${KFK_NAMESPACE}



echo ">>> Deplying Apache Kafka Zookeeper"

# Kafka zookeeper service should be deployed before the kafka service

kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"



KFK_ZOOKEEPER_SERVICE="zookeeper-service"    # this command may be replaced with command to extract service name automatically

KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEEPER_SERVICE} -o 'jsonpath={.spec.clusterIP}')



# Kafka service should be deployed after the zookeeper service

sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



echo ">>> Deploying Apache Kafka Broker"

kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



echo ">>> Verifing Apache Kafka deployment"

sleep 10

KFK_PODS_STATUS=$(kubectl --namespace ${KFK_NAMESPACE} get pods)

if echo "$KFK_PODS_STATUS" | grep -qEv 'STATUS|Running'; then

    echo "Deployment Error: \n $KFK_PODS_STATUS"

else

    echo "$KFK_PODS_STATUS"

fi
 
 No newline at end of file

deploy/tfs.sh

+15 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
@@ -137,10 +137,23 @@ printf "\n" 


echo "Create secret with CockroachDB data"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_CONTEXT=${CRDB_DATABASE}  # TODO: change by specific configurable environment variable

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

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE_CONTEXT} \

    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \

    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \

    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with CockroachDB data for KPI Management"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_KPI_MGMT="tfs_kpi_mgmt"  # TODO: change by specific configurable environment variable

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

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE_KPI_MGMT} \

    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \

    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \

    --from-literal=CRDB_SSLMODE=require

install_requirements.sh

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
ALL_COMPONENTS="context device service nbi monitoring webui interdomain slice"

ALL_COMPONENTS="${ALL_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector"

ALL_COMPONENTS="${ALL_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector"

ALL_COMPONENTS="${ALL_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api"

TFS_COMPONENTS=${TFS_COMPONENTS:-$ALL_COMPONENTS}



# Some components require libyang built from source code

manifests/kafka/01-zookeeper.yaml

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# Licensed to the Apache Software Foundation (ASF) under one or more

# contributor license agreements. See the NOTICE file distributed with

# this work for additional information regarding copyright ownership.

# The ASF licenses this file to You 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: v1

kind: Service

metadata:

  labels:

    app: zookeeper-service

  name: zookeeper-service

  namespace: kafka

spec:

  type: NodePort

  ports:

    - name: zookeeper-port

      port: 2181

      nodePort: 30181

      targetPort: 2181

  selector:

    app: zookeeper

---

apiVersion: apps/v1

kind: Deployment

metadata:

  labels:

    app: zookeeper

  name: zookeeper

  namespace: kafka

spec:

  replicas: 1

  selector:

    matchLabels:

      app: zookeeper

  template:

    metadata:

      labels:

        app: zookeeper

    spec:

      containers:

        - image: wurstmeister/zookeeper

          imagePullPolicy: IfNotPresent

          name: zookeeper

          ports:

            - containerPort: 2181
 
 No newline at end of file