sciveo 0.0.47__tar.gz → 0.0.48__tar.gz

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

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

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

@@ -42,8 +42,11 @@ class BaseMonitor(DaemonBase):
     # 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)
+    self.previous_io_counters = {
+      "DISK": psutil.disk_io_counters(perdisk=False),
+      "NET": psutil.net_io_counters(pernic=False)
+    }
+    self.previous_time = {"DISK": time.time(), "NET": time.time()}
     time.sleep(1)
 
     machine_serial = self.getserial()
@@ -137,10 +140,9 @@ class BaseMonitor(DaemonBase):
 
   def get_disk(self):
     try:
-      list_metrics = ["read count", "write count", "read bytes", "write bytes", "read time", "write time"]
+      list_metrics = ["read bytes", "write bytes", "read count", "write count", "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
+      self.get_io_metrics("DISK", list_metrics, disk_io_counters)
     except Exception as e:
       pass
 
@@ -148,18 +150,23 @@ class BaseMonitor(DaemonBase):
     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
+      self.get_io_metrics("NET", list_metrics, net_io_counters)
     except Exception as e:
       pass
 
-  def get_io_metrics(self, name, list_metrics, io_counters, prev_io_counters):
+  def get_io_metrics(self, name, list_metrics, io_counters):
     counters = io_counters._asdict()
-    prev_io_counters = prev_io_counters._asdict()
+    prev_io_counters = self.previous_io_counters[name]._asdict()
+    time_diff = time.time() - self.previous_time[name]
     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 "bytes" in metric_name:
+        speed_metric = metric_name.replace("bytes", "speed")
+        self.data[name][speed_metric] = self.data[name][metric_name] / time_diff
+    self.previous_time[name] = time.time()
+    self.previous_io_counters[name] = io_counters
 
 if __name__ == "__main__":
   mon = BaseMonitor(period=10)

sciveo-0.0.48/sciveo/version.py

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

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

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

sciveo-0.0.47/sciveo/version.py

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