sciveo 0.0.28__tar.gz → 0.0.30__tar.gz

{sciveo-0.0.28 → sciveo-0.0.30}/PKG-INFO

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

{sciveo-0.0.28 → sciveo-0.0.30}/sciveo/api/base.py

@@ -22,7 +22,7 @@ class APIRemoteClient:
     if base_url is None:
       base_url = os.environ.get("SCIVEO_API_BASE_URL", "https://sciveo.com")
     self.base_url = f"{base_url}/api/v{ver}/"
-    self.headers = { "Auth-Token": os.environ['SCIVEO_SECRET_ACCESS_KEY'] }
+    self.headers = { "Auth-Token": os.environ.get('SCIVEO_SECRET_ACCESS_KEY', "") }
     debug(type(self).__name__, f"base url: {self.base_url}")
 
   def POST_SCI(self, content_type, data, timeout=30):

{sciveo-0.0.28 → sciveo-0.0.30}/sciveo/common/tools/hardware.py

@@ -10,9 +10,25 @@
 #
 
 import os
+import datetime
+import uuid
+import random
+import string
 
 from sciveo.common.tools.formating import format_memory_size
 
+
+def new_guid_uuid():
+  return datetime.datetime.now().strftime("%Y%m%d%H%M%S") + "-" + str(uuid.uuid4()).replace("-", "")
+
+def random_token(num_characters):
+  characters = string.ascii_letters + string.digits
+  return ''.join(random.choices(characters, k=num_characters))
+
+def new_guid(num_characters=32):
+  return datetime.datetime.now().strftime("%Y%m%d%H%M%S") + "-" + random_token(num_characters)
+
+
 class HardwareInfo:
   def __init__(self):
     self.data = {

{sciveo-0.0.28 → sciveo-0.0.30}/sciveo/monitoring/monitor.py

@@ -11,12 +11,14 @@
 
 import os
 import time
+import datetime
+import socket
 import psutil
 import numpy as np
 
 from sciveo.common.tools.logger import *
 from sciveo.common.tools.daemon import DaemonBase
-from sciveo.common.tools.hardware import HardwareInfo
+from sciveo.common.tools.hardware import *
 from sciveo.common.tools.formating import format_memory_size
 from sciveo.api.base import APIRemoteClient
 
@@ -24,12 +26,18 @@ from sciveo.api.base import APIRemoteClient
 class BaseMonitor(DaemonBase):
   def __init__(self, period=5):
     super().__init__(period=period)
+
     self.data = HardwareInfo()()
     self.data.setdefault("CPU", {})
     self.data["RAM"] = {
       "installed": self.data["RAM"]
     }
     psutil.cpu_percent(interval=0.5)
+    self.getserial()
+
+    self.data["logs"] = {}
+    self.list_logs = []
+
     self.api = APIRemoteClient()
 
   def __call__(self):
@@ -38,7 +46,17 @@ class BaseMonitor(DaemonBase):
   def loop(self):
     self.get_cpu_usage()
     self.get_memory()
-    debug(type(self).__name__, "loop", self())
+
+    self.tail_logs()
+    self.data["local_time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+    api_result = self.api.POST_SCI("monitor", {"data": self.data})
+
+    debug(type(self).__name__, self(), "api_result", api_result)
+
+  def tail_logs(self):
+    for log_name, log_path in self.list_logs:
+      self.data["logs"][log_name] = self.tail_file(log_path)[-3:]
 
   def get_cpu_usage(self):
     self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
@@ -52,6 +70,35 @@ class BaseMonitor(DaemonBase):
     self.data["RAM"]["free"] = memory.free
     self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
 
+  def getserial(self):
+    cpuserial = None
+    try:
+      with open('/proc/cpuinfo','r') as fp:
+        for line in fp:
+          if line.startswith('Serial'):
+            cpuserial = line[10:26]
+    except Exception:
+      pass
+    if cpuserial is None:
+      try:
+        cpuserial = socket.gethostname()
+      except Exception:
+        pass
+    if cpuserial is None:
+      cpuserial = f"RND-{random_token(8)}"
+    self.data["serial"] = cpuserial
+    return cpuserial
+
+  def tail_file(self, file_path, block_size=1024):
+    result = ["EMPTY"]
+    try:
+      with open(file_path,'rb') as fp:
+        fp.seek(-block_size, os.SEEK_END)
+        result = str(fp.read(block_size).rstrip()).split("\\n")
+    except Exception as e:
+      error(e, "tail_file", file_path)
+    return result
+
 
 if __name__ == "__main__":
   mon = BaseMonitor(period=10)

sciveo-0.0.30/sciveo/version.py

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

{sciveo-0.0.28 → sciveo-0.0.30}/sciveo.egg-info/PKG-INFO

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

sciveo-0.0.28/sciveo/version.py

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