ft-orchestration manual probe track running state and jq calculate timestamps if missing

Author: pascal260303

tools/ft-orchestration/src/collector/jq.py

@@ -103,6 +103,9 @@ def __init__(self, executor: Executor, file: str):
 ipfixcol2 -c {Path(self._conf_dir, self.CONFIG_FILE)} | jq -r "
   .[\\"iana:sourceIPAddress\\"] = (.\\"iana:sourceIPv4Address\\" // .\\"iana:sourceIPv6Address\\") |
   .[\\"iana:destinationIPAddress\\"] = (.\\"iana:destinationIPv4Address\\" // .\\"iana:destinationIPv6Address\\") |
+  
+  .[\\"iana:flowStartMilliseconds\\"] //= .[\\"iana:systemInitTimeMilliseconds\\"] + .[\\"iana:flowStartSysUpTime\\"] |
+  .[\\"iana:flowEndMilliseconds\\"] //= .[\\"iana:systemInitTimeMilliseconds\\"] + .[\\"iana:flowEndSysUpTime\\"] |
   del(
     .\\"iana:sourceIPv4Address\\",
     .\\"iana:sourceIPv6Address\\",

tools/ft-orchestration/src/probe/manual.py

@@ -45,12 +45,14 @@ def __init__(
     ):
         self._timeouts = (active_timeout, inactive_timeout)
         self.host_statistics = EmptyHostStats(executor, "")
+        self.running = False
 
     def start(self):
         logging.warning("start probe now")
         for i in range(10, -1, -1):
             logging.info(i)
             time.sleep(1)
+        self.running = True
 
     def supported_fields(self):
         pass
@@ -59,11 +61,15 @@ def get_special_fields(self):
         pass
 
     def stop(self):
+        if not self.running:
+            return
+
         logging.warning("you can stop the probe now")
         wait_time = max(self._timeouts)
         for i in range(wait_time, -1, -1):
             logging.info(i)
             time.sleep(1)
+        self.running = False
 
     def cleanup(self):
         pass