- Major fixes in the implementation of the monitoring of KPIs in the Centralized Attack Detector.

- Added script to deploy a single component of scenario 3.

deploy_component.sh

@@ -56,16 +56,16 @@ for COMPONENT in $TFS_COMPONENTS; do
     echo "Processing '$COMPONENT' component..."
     IMAGE_NAME="$COMPONENT:$TFS_IMAGE_TAG"
     IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$IMAGE_NAME" | sed 's,//,/,g' | sed 's,http:/,,g')
-
+    
     echo "  Building Docker image..."
     BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"
-
+    
     if [ "$COMPONENT" == "automation" ] || [ "$COMPONENT" == "policy" ]; then
         docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"
-    elif [ "$COMPONENT" == "pathcomp" ]; then
+        elif [ "$COMPONENT" == "pathcomp" ]; 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"
-
+        
         BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log"
         docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"
         # next command is redundant, but helpful to keep cache updated between rebuilds
@@ -73,44 +73,44 @@ for COMPONENT in $TFS_COMPONENTS; do
     else
         docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG"
     fi
-
+    
     if [ -n "$TFS_REGISTRY_IMAGE" ]; then
         echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGE'..."
-
+        
         if [ "$COMPONENT" == "pathcomp" ]; then
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
             docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL-frontend" > "$TAG_LOG"
-
+            
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"
             docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL-backend" > "$TAG_LOG"
-
+            
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"
             docker push "$IMAGE_URL-frontend" > "$PUSH_LOG"
-
+            
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"
             docker push "$IMAGE_URL-backend" > "$PUSH_LOG"
         else
             TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log"
             docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG"
-
+            
             PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"
             docker push "$IMAGE_URL" > "$PUSH_LOG"
         fi
     fi
-
+    
     echo "  Adapting '$COMPONENT' manifest file..."
     MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"
     cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
-
+    
     if [ -n "$TFS_REGISTRY_IMAGE" ]; then
         # Registry is set
         if [ "$COMPONENT" == "pathcomp" ]; then
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL-frontend#g" "$MANIFEST"
-
+            
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_URL-backend#g" "$MANIFEST"
-
+            
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"
         else
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
@@ -122,10 +122,10 @@ for COMPONENT in $TFS_COMPONENTS; do
         if [ "$COMPONENT" == "pathcomp" ]; then
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_NAME-frontend#g" "$MANIFEST"
-
+            
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-backend:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-backend:${VERSION}#image: $IMAGE_NAME-backend#g" "$MANIFEST"
-
+            
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
         else
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
@@ -133,9 +133,9 @@ for COMPONENT in $TFS_COMPONENTS; do
             sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"
         fi
     fi
-
+    
     # TODO: harmonize names of the monitoring component
-
+    
     echo "  Deploying '$COMPONENT' component to Kubernetes..."
     DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
     kubectl --namespace $TFS_K8S_NAMESPACE delete -f "$MANIFEST" > "$DEPLOY_LOG"
@@ -143,33 +143,33 @@ for COMPONENT in $TFS_COMPONENTS; do
     COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
     kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
     kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
-
+    
     echo "  Collecting env-vars for '$COMPONENT' component..."
-
+    
     SERVICE_DATA=$(kubectl get service ${COMPONENT}service --namespace $TFS_K8S_NAMESPACE -o json)
     if [ -z "${SERVICE_DATA}" ]; then continue; fi
-
+    
     # Env vars for service's host address
     SERVICE_HOST=$(echo ${SERVICE_DATA} | jq -r '.spec.clusterIP')
     if [ -z "${SERVICE_HOST}" ]; then continue; fi
     # TODO: remove previous value from file
     ENVVAR_HOST=$(echo "${COMPONENT}service_SERVICE_HOST" | tr '[:lower:]' '[:upper:]')
     echo "export ${ENVVAR_HOST}=${SERVICE_HOST}" >> $ENV_VARS_SCRIPT
-
+    
     # Env vars for service's 'grpc' port (if any)
     SERVICE_PORT_GRPC=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="grpc") | .port')
     if [ -n "${SERVICE_PORT_GRPC}" ]; then
         ENVVAR_PORT_GRPC=$(echo "${COMPONENT}service_SERVICE_PORT_GRPC" | tr '[:lower:]' '[:upper:]')
         echo "export ${ENVVAR_PORT_GRPC}=${SERVICE_PORT_GRPC}" >> $ENV_VARS_SCRIPT
     fi
-
+    
     # Env vars for service's 'http' port (if any)
     SERVICE_PORT_HTTP=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="http") | .port')
     if [ -n "${SERVICE_PORT_HTTP}" ]; then
         ENVVAR_PORT_HTTP=$(echo "${COMPONENT}service_SERVICE_PORT_HTTP" | tr '[:lower:]' '[:upper:]')
         echo "export ${ENVVAR_PORT_HTTP}=${SERVICE_PORT_HTTP}" >> $ENV_VARS_SCRIPT
     fi
-
+    
     printf "\n"
 done
 
@@ -177,7 +177,7 @@ done
 for COMPONENT in $TFS_COMPONENTS; do
     echo "Waiting for '$COMPONENT' component..."
     kubectl wait --namespace $TFS_K8S_NAMESPACE \
-        --for='condition=available' --timeout=300s deployment/${COMPONENT}service
+    --for='condition=available' --timeout=3s deployment/${COMPONENT}service
     printf "\n"
 done
 

deploy_l3_component.sh

+component=$1
+
+source "my_deploy.sh"
+
+echo "Deploying $component..."
+
+# check if component == "CAD"
+if [ $component == "CAD" ]; then
+    # find kubernetes pod that contains "centralizedattackdetectorservice"
+    pod=$(kubectl --namespace $TFS_K8S_NAMESPACE get pods | grep l3-centralizedattackdetectorservice | awk '{print $1}')
+    
+    # delete pod
+    kubectl --namespace $TFS_K8S_NAMESPACE delete pod $pod --force --grace-period=0
+    
+    # # wait for pod to be deleted
+    # while [ $(kubectl --namespace $TFS_K8S_NAMESPACE get pods | grep l3-centralizedattackdetectorservice | wc -l) -gt 0 ]; do
+    #     sleep 1
+    # done
+    
+    # deploy l3_centralizedattackdetector component
+    ./deploy_component.sh "l3_centralizedattackdetector"
+fi
+
+# check if component == "AM"
+if [ $component == "AM" ]; then
+    # find kubernetes pod that contains "l3-attackmitigatorservice"
+    pod=$(kubectl --namespace $TFS_K8S_NAMESPACE get pods | grep l3-attackmitigatorservice | awk '{print $1}')
+    
+    # delete pod
+    kubectl --namespace $TFS_K8S_NAMESPACE delete pod $pod --force --grace-period=0
+    
+    # # wait for pod to be deleted
+    # while [ $(kubectl --namespace $TFS_K8S_NAMESPACE get pods | grep l3-attackmitigatorservice | wc -l) -gt 0 ]; do
+    #     sleep 1
+    # done
+    
+    # deploy l3_attackmitigator component
+    ./deploy_component.sh "l3_attackmitigator"
+fi
+
+echo "Component $component deployed"
+
+echo "Restarting DAD..."
+sshpass -p "ubuntu" ssh -o StrictHostKeyChecking=no -n -f ubuntu@192.168.165.73 "sh -c 'nohup /home/ubuntu/TeraflowDockerDistributed/restart.sh > /dev/null 2>&1 &'"
+echo "DAD restarted"
\ No newline at end of file