sync code

nodes/orchestration/CMakeLists.txt

@@ -31,6 +31,7 @@ target_link_libraries(
     local_policy_mgmt_gen
     curl
     external_sdk_server
+	service_health_status
     -Wl,--end-group
 )
 

nodes/orchestration/main.cc

@@ -52,6 +52,7 @@
 #include "tenant_manager.h"
 #include "local_policy_mgmt_gen.h"
 #include "external_sdk_server.h"
+#include "service_health_status.h"
 
 using namespace std;
 
@@ -74,7 +75,8 @@ main(int argc, char **argv)
         HealthChecker,
         HealthCheckManager,
         LocalPolicyMgmtGenerator,
-        ExternalSdkServer
+        ExternalSdkServer,
+        ServiceHealthStatus
     > comps;
 
     comps.registerGlobalValue<uint>("Nano service API Port Primary", 7777);

nodes/orchestration/package/cpnano_debug/cpnano_debug.cc

@@ -92,6 +92,7 @@ enum class Service {
     HTTP_TRANSACTION_HANDLER,
     DEDICATED_NETWORK_HANDLER,
     HELLO_WORLD,
+    PROMETHEUS,
     IDA_SAML,
     IDA_IDN,
     IDA_IDN_BG,
@@ -170,6 +171,7 @@ getServiceString(const Service service)
         case (Service::LOGGER_SDWAN): return "logger-sdwan";
         case (Service::IOT_WLP): return "workload-protection";
         case (Service::HELLO_WORLD): return "hello-world";
+        case (Service::PROMETHEUS): return "prometheus";
         case (Service::IDA_SAML): return "ida-saml";
         case (Service::IDA_IDN): return "ida-idn";
         case (Service::IDA_IDN_BG): return "ida-idn-bg";
@@ -363,6 +365,11 @@ getServiceConfig (const Service service)
                 filesystem_path + "/conf/cp-nano-hello-world-conf.json",
                 log_files_path + "/nano_agent/cp-nano-hello-world.dbg"
             );
+        case (Service::PROMETHEUS):
+            return ServiceConfig(
+                filesystem_path + "/conf/cp-nano-prometheus-debug-conf.json",
+                log_files_path + "/nano_agent/cp-nano-prometheus.dbg"
+            );
         case (Service::IOT_ACCESS_CONTROL):
             return ServiceConfig(
                 filesystem_path + "/conf/cp-nano-iot-access-control-debug-conf.json",
@@ -1308,6 +1315,8 @@ extractServices(const vector<string> &args)
             services.push_back(Service::IOT_ACCESS_CONTROL);
         } else if (getServiceString(Service::HORIZON_TELEMETRY).find(maybe_service) == 0) {
             services.push_back(Service::HORIZON_TELEMETRY);
+        } else if (getServiceString(Service::PROMETHEUS).find(maybe_service) == 0) {
+            services.push_back(Service::PROMETHEUS);
         } else {
             break;
         }

nodes/orchestration/package/orchestration_package.sh

@@ -971,12 +971,15 @@ install_orchestration()
         if [ -n "${OTP_TOKEN}" ]; then
             cp_print "Saving authentication token to file"
             printf '{\n   "registration type": "token",\n   "registration data": "%b"\n}' "$OTP_TOKEN" | ${FILESYSTEM_PATH}/${BIN_PATH}/${CP_NANO_BASE64} -e > ${FILESYSTEM_PATH}/${CONF_PATH}/registration-data.json
-            rm ${FILESYSTEM_PATH}/${CONF_PATH}/agent_details.json
-            rm ${FILESYSTEM_PATH}/${CONF_PATH}/orchestration_status.json
-            echo '{}'>${FILESYSTEM_PATH}/${CONF_PATH}/policy.json
+            previous_mode=$(awk -F\" '/Orchestration mode/{print $4}' /etc/cp/conf/agent_details.json)
+            if [ "$previous_mode" = "hybrid_mode" ]; then
+                rm ${FILESYSTEM_PATH}/${CONF_PATH}/agent_details.json
+                rm ${FILESYSTEM_PATH}/${CONF_PATH}/orchestration_status.json
+                echo '{}'>${FILESYSTEM_PATH}/${CONF_PATH}/policy.json
 
-            if [ -f ${FILESYSTEM_PATH}/data/data5.a ]; then
-                rm ${FILESYSTEM_PATH}/data/data5.a
+                if [ -f ${FILESYSTEM_PATH}/data/data5.a ]; then
+                    rm ${FILESYSTEM_PATH}/data/data5.a
+                fi
             fi
         fi