fix only essential qoutes

build_system/docker/entry.sh

@@ -36,7 +36,7 @@ if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
     exit 1
 fi
 
-if [ -z $1 ]; then
+if [ -z "$1" ]; then
     var_mode="--hybrid_mode"
 fi
 
@@ -60,30 +60,30 @@ while true; do
     shift
 done
 
-if [ -z $var_token ] && [ $var_mode != "--hybrid_mode" ]; then
+if [ -z "$var_token" ] && [ "$var_mode" != "--hybrid_mode" ]; then
     var_token=$(env | grep 'AGENT_TOKEN=' | cut -d'=' -f2-)
-    if  [ -z $var_token ]; then
+    if  [ -z "$var_token" ]; then
         echo "Error: Token was not provided as input argument."
         exit 1
     fi
 fi
 
 orchestration_service_installation_flags="--container_mode --skip_registration"
-if [ ! -z $var_token ]; then
+if [ -n "$var_token" ]; then
     export AGENT_TOKEN="$var_token"
     orchestration_service_installation_flags="$orchestration_service_installation_flags --token $var_token"
 fi
-if [ ! -z $var_fog_address ]; then
+if [ -n "$var_fog_address" ]; then
     orchestration_service_installation_flags="$orchestration_service_installation_flags --fog $var_fog_address"
 fi
-if [ ! -z $var_proxy ]; then
+if [ -n "$var_proxy" ]; then
     orchestration_service_installation_flags="$orchestration_service_installation_flags --proxy $var_proxy"
 fi
 
-if [ ! -z $var_mode ]; then
+if [ -n "$var_mode" ]; then
     orchestration_service_installation_flags="$orchestration_service_installation_flags $var_mode"
 fi
-if [ ! -z "$var_ignore" ]; then
+if [ -n "$var_ignore" ]; then
     orchestration_service_installation_flags="$orchestration_service_installation_flags $var_ignore"
 fi
 
@@ -114,7 +114,7 @@ fi
 # use advanced model if exist as data for agent
 FILE=/advanced-model/open-appsec-advanced-model.tgz
 if [ -f "$FILE" ]; then
-    tar -xzvf $FILE -C /etc/cp/conf/waap
+    tar -xzvf "$FILE" -C /etc/cp/conf/waap
 fi
 
 touch /etc/cp/watchdog/wd.startup

components/security_apps/orchestration/orchestration_comp.cc

@@ -1522,12 +1522,6 @@ private:
 
         agent_data_report << make_pair("registeredServer", i_agent_details->getRegisteredServer());
 
-        const char *prometheus_env = getenv("PROMETHEUS");
-        if (prometheus_env != nullptr) {
-            auto enable_prometheus = string(prometheus_env) == "true";
-            agent_data_report << AgentReportFieldWithLabel("enablePrometheus", enable_prometheus ? "true" : "false");
-        }
-
 #if defined(gaia) || defined(smb)
         if (i_details_resolver->compareCheckpointVersion(8100, greater_equal<int>())) {
             agent_data_report << AgentReportFieldWithLabel("isCheckpointVersionGER81", "true");
@@ -2278,4 +2272,4 @@ OrchestrationComp::preload()
     registerExpectedSetting<uint>("successUpgradeInterval");
     registerExpectedConfigFile("orchestration", Config::ConfigFileType::Policy);
     registerExpectedConfigFile("registration-data", Config::ConfigFileType::Policy);
-}
+}

components/security_apps/orchestration/update_communication/fog_authenticator.cc

@@ -227,11 +227,6 @@ FogAuthenticator::registerAgent(
 
     request << make_pair("userEdition", getUserEdition());
 
-    const char *prometheus_env = getenv("PROMETHEUS");
-    if (prometheus_env != nullptr) {
-        request << make_pair("enablePrometheus", string(prometheus_env) == "true" ? "true" : "false");
-    }
-
     if (getDeplymentType() == "Docker" || getDeplymentType() == "K8S") {
         const char *image_version_otp = getenv("IMAGE_VERSION");
         if (image_version_otp) {

nodes/orchestration/package/orchestration_package.sh

@@ -209,9 +209,6 @@ save_local_policy_config()
 if [ -n "${CP_ENV_FILESYSTEM}" ] ; then
     export FILESYSTEM_PATH=$CP_ENV_FILESYSTEM
 fi
-if [ -n "${PROMETHEUS}" ] ; then
-    export PROMETHEUS=$PROMETHEUS
-fi
 if [ -n "${CP_ENV_LOG_FILE}" ] ; then
     LOG_FILE_PATH=$CP_ENV_LOG_FILE
 fi
@@ -436,7 +433,7 @@ if command -v which &>/dev/null; then
     var_which_cmd_exists=1
 fi
 
-if [ $var_arch != "gaia" ] && [ $var_arch != "gaia_arm" ] && [ $var_which_cmd_exists -eq 1 ]; then
+if [ $var_arch != "gaia" ] && [ $var_arch != "gaia_arm" ] && [ $var_which_cmd_exists -eq 1 ]; then 
     if [ -n "$(which systemctl)" ]; then
         var_startup_service="systemd"
     else
@@ -977,7 +974,7 @@ install_orchestration()
         fi
         ${INSTALL_COMMAND} lib/*.so* ${USR_LIB_PATH}/
         ${INSTALL_COMMAND} lib/boost/*.so* ${USR_LIB_PATH}/
-        cp_print "Done successfully doing only unpacking lib64 to Path: ${USR_LIB_PATH}" ${FORCE_STDOUT}
+        cp_print "Done successfully doing only unpacking lib64 to Path: ${USR_LIB_PATH}" ${FORCE_STDOUT}	
         exit 0
     fi
 
@@ -1152,9 +1149,6 @@ install_orchestration()
 		if [ -n "${FILESYSTEM_PATH}" ]; then
 			echo "CP_ENV_FILESYSTEM=${FILESYSTEM_PATH}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
 		fi
-        if [ -n "${PROMETHEUS}" ]; then
-            echo "PROMETHEUS=${PROMETHEUS}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
-        fi
 		if [ -n "${VS_ID}" ]; then
 			echo "CP_VS_ID=${VS_ID}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
 		fi

nodes/orchestration/package/watchdog/watchdog

@@ -115,11 +115,6 @@ load_paths()
     if [ -n "${CP_ENV_LOG_FILE}" ]; then
         LOG_FILE_PATH=$CP_ENV_LOG_FILE
     fi
-
-    if [ -n "${PROMETHEUS}" ]; then
-        export PROMETHEUS=$PROMETHEUS
-    fi
-
     if [ -n "${CP_VS_ID}" ]; then
         VS_ID=${CP_VS_ID}
         VS_EVAL_PREFIX="ip netns exec CTX0000${VS_ID} env"