Commit 2f78cc2d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into tag/cttc-kpi-collection

parents 4678d291 1029acfe

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -28,9 +28,10 @@ include: 
  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'

  #- local: '/src/dbscanserving/.gitlab-ci.yml'

  #- local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  #- local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/dbscanserving/.gitlab-ci.yml'

  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  - local: '/src/opticalattackdetector/.gitlab-ci.yml'

  - local: '/src/opticalattackmanager/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

common_requirements.in

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ coverage==6.3 
grpcio==1.47.*

grpcio-health-checking==1.47.*

grpcio-tools==1.47.*

grpclib==0.4.4

prettytable==3.5.0

prometheus-client==0.13.0

protobuf==3.20.*

deploy/crdb.sh

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ TMP_FOLDER="./tmp" 
CRDB_MANIFESTS_PATH="manifests/cockroachdb"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

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

mkdir -p $TMP_MANIFESTS_FOLDER



function crdb_deploy_single() {

deploy/qdb.sh

+3 −1
Original line number Diff line number Diff line
@@ -64,12 +64,14 @@ TMP_FOLDER="./tmp" 
QDB_MANIFESTS_PATH="manifests/questdb"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

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

mkdir -p $TMP_MANIFESTS_FOLDER



function qdb_deploy() {

    echo "QuestDB Namespace"

    echo ">>> Create QuestDB Namespace (if missing)"

    kubectl create namespace ${QDB_NAMESPACE}

    sleep 2

    echo



    echo "QuestDB"

deploy/tfs.sh

+45 −2
Original line number Diff line number Diff line
@@ -124,14 +124,15 @@ GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller" 
TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

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

mkdir -p $TMP_MANIFESTS_FOLDER

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"

TMP_LOGS_FOLDER="${TMP_FOLDER}/${TFS_K8S_NAMESPACE}/logs"

mkdir -p $TMP_LOGS_FOLDER



echo "Deleting and Creating a new namespace..."

kubectl delete namespace $TFS_K8S_NAMESPACE --ignore-not-found

kubectl create namespace $TFS_K8S_NAMESPACE

sleep 2

printf "\n"



echo "Create secret with CockroachDB data"
@@ -175,6 +176,14 @@ echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT 
PYTHONPATH=$(pwd)/src

echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT



echo "Create Redis secret..."

# first try to delete an old one if exists

kubectl delete secret redis-secrets --namespace=$TFS_K8S_NAMESPACE --ignore-not-found

REDIS_PASSWORD=`uuidgen`

kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \

    --from-literal=REDIS_PASSWORD=$REDIS_PASSWORD

echo "export REDIS_PASSWORD=${REDIS_PASSWORD}" >> $ENV_VARS_SCRIPT



for COMPONENT in $TFS_COMPONENTS; do

    echo "Processing '$COMPONENT' component..."
@@ -424,6 +433,31 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then 
    }' ${GRAFANA_URL_UPDATED}/api/datasources

    echo



    curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{

        "access"   : "proxy",

        "type"     : "postgres",

        "name"     : "cockroachdb",

        "url"      : "'cockroachdb-public.${CRDB_NAMESPACE}.svc.cluster.local:${CRDB_SQL_PORT}'",

        "database" : "'${CRDB_DATABASE}'",

        "user"     : "'${CRDB_USERNAME}'",

        "basicAuth": false,

        "isDefault": false,

        "jsonData" : {

            "sslmode"               : "require",

            "postgresVersion"       : 1100,

            "maxOpenConns"          : 0,

            "maxIdleConns"          : 2,

            "connMaxLifetime"       : 14400,

            "tlsAuth"               : false,

            "tlsAuthWithCACert"     : false,

            "timescaledb"           : false,

            "tlsConfigurationMethod": "file-path",

            "tlsSkipVerify"         : true

        },

        "secureJsonData": {"password": "'${CRDB_PASSWORD}'"}

    }' ${GRAFANA_URL_UPDATED}/api/datasources

    echo



    # adding the datasource of the metrics collection framework

    curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{

        "access"   : "proxy",
@@ -504,5 +538,14 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then 
    curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}

    echo



    # Dashboard: Load Generator Status

    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_tfs_num_pods.json' \

        ${GRAFANA_URL_UPDATED}/api/dashboards/db

    echo

    DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-num-pods"

    DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id')

    curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}

    echo



    printf "\n\n"

fi