sciveo 0.0.45__tar.gz → 0.0.47__tar.gz

{sciveo-0.0.45 → sciveo-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.45
+Version: 0.0.47
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

{sciveo-0.0.45 → sciveo-0.0.47}/sciveo/common/tools/hardware.py

@@ -32,19 +32,25 @@ def new_guid(num_characters=32):
 
 class HardwareInfo:
   def __init__(self):
-    self.data = {
-      "CPU": {"count": os.cpu_count()},
-      "RAM": format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
-    }
+    self.data = {}
 
     self.get_cpu()
+    self.get_ram()
 
   def __call__(self):
     return self.data
 
+  def get_ram(self):
+    try:
+      self.data["RAM"] = format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
+    except Exception:
+      pass
+
   def get_cpu(self):
     list_keys = ["model name", "stepping", "cpu MHz", "cache size", "siblings", "cpu cores", "bogomips"]
     try:
+      self.data["CPU"] = {"count": os.cpu_count()}
+
       cpu_info = {}
       with open('/proc/cpuinfo', 'r') as file:
         lines = file.readlines()

{sciveo-0.0.45 → sciveo-0.0.47}/sciveo/monitoring/monitor.py

@@ -31,17 +31,19 @@ class BaseMonitor(DaemonBase):
 
     self.data = HardwareInfo()()
     self.data.setdefault("CPU", {})
-    self.data["RAM"] = {
-      "installed": self.data["RAM"]
-    }
+    self.data.setdefault("DISK", {})
+    self.data.setdefault("NET", {})
+    self.data["RAM"] = {}
     self.data["LOG"] = {}
     self.list_logs = []
 
     self.api = APIRemoteClient()
 
-    # Warmup the psutil cpu usage
+    # Warmup the psutil
     psutil.cpu_percent(interval=0.3, percpu=True)
     initial_cpu_usage = psutil.cpu_percent(interval=None, percpu=True)
+    self.previous_disk_io_counters = psutil.disk_io_counters(perdisk=False)
+    self.previous_net_io_counters = psutil.net_io_counters(pernic=False)
     time.sleep(1)
 
     machine_serial = self.getserial()
@@ -55,6 +57,8 @@ class BaseMonitor(DaemonBase):
     self.get_cpu_usage()
     self.get_memory()
     self.get_gpu()
+    self.get_disk()
+    self.get_network()
 
     self.tail_logs()
     self.data["local_time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -68,16 +72,23 @@ class BaseMonitor(DaemonBase):
       self.data["LOG"][log_name] = self.tail_file(log_path)[-3:]
 
   def get_cpu_usage(self):
-    usage_per_core = psutil.cpu_percent(interval=None, percpu=True)
-    self.data["CPU"]["usage per core"] = usage_per_core
-    self.data["CPU"]["usage"] = np.array(usage_per_core).mean()
+    try:
+      usage_per_core = psutil.cpu_percent(interval=None, percpu=True)
+      self.data["CPU"]["usage per core"] = usage_per_core
+      self.data["CPU"]["usage"] = np.array(usage_per_core).mean()
+    except Exception:
+      pass
 
   def get_memory(self):
-    memory = psutil.virtual_memory()
-    self.data["RAM"]["used"] = memory.used
-    self.data["RAM"]["total"] = memory.total
-    self.data["RAM"]["free"] = memory.free
-    self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
+    try:
+      memory = psutil.virtual_memory()
+      self.data["RAM"]["used"] = memory.used
+      self.data["RAM"]["total"] = memory.total
+      self.data["RAM"]["free"] = memory.free
+      # self.data["RAM"]["installed"] = format_memory_size(memory.total)
+      self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
+    except Exception:
+      pass
 
   def getserial(self):
     machine_serial = None
@@ -124,7 +135,30 @@ class BaseMonitor(DaemonBase):
     except Exception as e:
       pass
 
+  def get_disk(self):
+    try:
+      list_metrics = ["read count", "write count", "read bytes", "write bytes", "read time", "write time"]
+      disk_io_counters = psutil.disk_io_counters(perdisk=False)
+      self.get_io_metrics("DISK", list_metrics, disk_io_counters, self.previous_disk_io_counters)
+      self.previous_disk_io_counters = disk_io_counters
+    except Exception as e:
+      pass
+
+  def get_network(self):
+    try:
+      list_metrics = ["bytes sent", "bytes recv", "packets sent", "packets recv"]
+      net_io_counters = psutil.net_io_counters(pernic=False)
+      self.get_io_metrics("NET", list_metrics, net_io_counters, self.previous_net_io_counters)
+      self.previous_net_io_counters = net_io_counters
+    except Exception as e:
+      pass
 
+  def get_io_metrics(self, name, list_metrics, io_counters, prev_io_counters):
+    counters = io_counters._asdict()
+    prev_io_counters = prev_io_counters._asdict()
+    for metric_name in list_metrics:
+      metric_key = metric_name.replace(' ', '_')
+      self.data[name][metric_name] = counters[metric_key] - prev_io_counters[metric_key]
 
 
 if __name__ == "__main__":

sciveo-0.0.47/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.0.47'

{sciveo-0.0.45 → sciveo-0.0.47}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.45
+Version: 0.0.47
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

sciveo-0.0.45/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.0.45'