PyObservability 0.0.2__py3-none-any.whl → 0.1.0__py3-none-any.whl

pyobservability/main.py

@@ -2,6 +2,7 @@ import logging
 import pathlib
 import warnings
 
+import time
 import uiauth
 import uvicorn
 from fastapi import FastAPI, Request, WebSocket, WebSocketDisconnect
@@ -47,7 +48,11 @@ async def websocket_endpoint(websocket: WebSocket):
     q = monitor.subscribe()
     try:
         while True:
+            start = time.time()
             payload = await q.get()
+            end = time.time()
+            nodes = [d['name'] for d in payload["data"]]
+            LOGGER.debug("Payload generated in %s - %d %s", end - start, len(nodes), nodes)
             # send as JSON text
             await websocket.send_json(payload)
     except WebSocketDisconnect:
@@ -100,9 +105,7 @@ def include_routes():
 
 def start(**kwargs):
     settings.env = settings.env_loader(**kwargs)
-    settings.env.targets = [
-        {k: str(v) for k, v in target.model_dump().items()} for target in settings.env.targets
-    ]
+    settings.env.targets = [{k: str(v) for k, v in target.model_dump().items()} for target in settings.env.targets]
     include_routes()
     uvicorn_args = dict(
         host=settings.env.host,

pyobservability/monitor.py

@@ -1,97 +1,53 @@
-# app/monitor.py
-
 import asyncio
+import json
 import logging
 from asyncio import CancelledError
-from typing import Any, Dict, List
-from urllib.parse import urlparse
+from typing import Dict, List
 
 import aiohttp
 
 LOGGER = logging.getLogger("uvicorn.default")
-
-###############################################################################
-# ENDPOINT DEFINITIONS (PyNinja Correct)
-###############################################################################
-
-ENDPOINTS = {
-    "ip": {
-        "path": "/get-ip",
-        "params": {"public": "false"},
-    },
-    "cpu": {
-        "path": "/get-cpu",
-        "params": {"interval": 2, "per_cpu": "true"},
-    },
-    "cpu_load": {
-        "path": "/get-cpu-load",
-        "params": {},
-    },
-    "gpu": {
-        "path": "/get-processor",
-        "params": {},
-    },
-    "memory": {
-        "path": "/get-memory",
-        "params": {},
-    },
-    "disk": {
-        "path": "/get-disk-utilization",
-        "params": {"path": "/"},
-    },
-    "disks": {
-        "path": "/get-all-disks",
-        "params": {},
-    },
-    "services": {
-        "path": "/get-all-services",
-        "params": {},
-    },
-    "docker_stats": {
-        "path": "/get-docker-stats",
-        "params": {},
-    },
-    "certificates": {
-        "path": "/get-certificates",
-        "params": {},
-    },
-}
-
-
-###############################################################################
-# MONITOR CLASS
-###############################################################################
+OBS_PATH = "/observability"
 
 
 class Monitor:
-
     def __init__(self, targets: List[Dict[str, str]], poll_interval: float):
         self.targets = targets
         self.poll_interval = poll_interval
         self.sessions: Dict[str, aiohttp.ClientSession] = {}
         self._ws_subscribers: List[asyncio.Queue] = []
-        self._task = None
+        self._task: asyncio.Task | None = None
         self._stop = asyncio.Event()
 
     ############################################################################
     # LIFECYCLE
     ############################################################################
     async def start(self):
+        self._tasks = []
+
         for target in self.targets:
-            self.sessions[target["base_url"]] = aiohttp.ClientSession()
-        self._task = asyncio.create_task(self._run_loop())
+            base = target["base_url"]
+            name = target.get("name")
+            apikey = target.get("apikey")
+
+            session = aiohttp.ClientSession()
+            self.sessions[base] = session
+
+            task = asyncio.create_task(self._stream_target(name, base, session, apikey))
+            self._tasks.append(task)
 
     async def stop(self):
         self._stop.set()
-        if self._task:
-            self._task.cancel()
+
+        for task in self._tasks:
+            task.cancel()
             try:
-                await self._task
+                await task
             except CancelledError:
                 pass
 
-        for sess in self.sessions.values():
-            await sess.close()
+        for session in self.sessions.values():
+            await session.close()
 
     ############################################################################
     # SUBSCRIBE / UNSUBSCRIBE
@@ -108,91 +64,58 @@ class Monitor:
             pass
 
     ############################################################################
-    # FETCH WRAPPER
+    # FETCH OBSERVABILITY FOR SINGLE TARGET
     ############################################################################
-    async def _fetch(self, session, base_url, ep, headers: Dict[str, str], params=None):
-        url = base_url.rstrip("/") + ep
+    async def _fetch_observability(self, session, base_url, apikey):
+        url = base_url.rstrip("/") + OBS_PATH + f"?interval={self.poll_interval}"
+        headers = {"accept": "application/json"}
+        if apikey:
+            headers["Authorization"] = f"Bearer {apikey}"
+
         try:
-            async with session.get(url, headers=headers, params=params, timeout=10) as resp:
-                if resp.status == 200:
+            async with session.get(url, headers=headers, timeout=None) as resp:
+                if resp.status != 200:
+                    LOGGER.debug("Exception - [%d]: %s", resp.status, await resp.text())
+                    return
+                async for line in resp.content:
+                    line = line.decode().strip()
+                    if not line:
+                        continue
                     try:
-                        return await resp.json()
-                    except Exception as err:
-                        LOGGER.debug(err)
-                        return "NO DATA"
-                parsed = urlparse(url)
-                LOGGER.debug("Exception on '%s' - [%d]: %s", parsed.path, resp.status, await resp.text())
-                return "NO DATA"
+                        payload = json.loads(line)
+                        # yield each record instead of returning
+                        yield payload
+                    except json.JSONDecodeError as err:
+                        LOGGER.debug("JSON decode error: %s | line=%s", err, line)
         except Exception as err:
-            LOGGER.debug(err)
-            return "NO DATA"
+            LOGGER.debug("Exception: %s", err)
+            return
 
     ############################################################################
-    # PER-TARGET POLLING
+    # STREAM A SPECIFIC TARGET - SEQUENTIAL OVER ALL TARGETS
     ############################################################################
-    async def _poll_target(self, target: Dict[str, Any]) -> Dict[str, Any]:
-        base = target["base_url"]
-        apikey = target["apikey"]
-        session = self.sessions[base]
-        headers = {"Accept": "application/json", "Authorization": f"Bearer {apikey}"}
-
-        result = {"name": target["name"], "base_url": base, "metrics": {}}
-
-        # Fire ALL requests concurrently
-        tasks = {}
-
-        for key, cfg in ENDPOINTS.items():
-            tasks[key] = asyncio.create_task(
-                self._fetch(session, base, cfg["path"], headers=headers, params=cfg["params"])
-            )
-
-        # Wait for all endpoints
-        raw_results = await asyncio.gather(*tasks.values(), return_exceptions=True)
-
-        for (key, _), resp in zip(tasks.items(), raw_results):
-            if isinstance(resp, Exception):
-                result["metrics"][key] = "NO DATA"
-                continue
-            if isinstance(resp, dict):
-                result["metrics"][key] = resp.get("detail", resp)
-            else:
-                # raw string / number / list / etc
-                result["metrics"][key] = resp
-
-        return result
-
-    ############################################################################
-    # POLL ALL HOSTS
-    ############################################################################
-    async def _poll_all(self) -> List[Dict[str, Any]]:
-        tasks = [self._poll_target(target) for target in self.targets]
-        results = await asyncio.gather(*tasks, return_exceptions=True)
-        out = []
-        for r in results:
-            if isinstance(r, Exception):
-                LOGGER.error("%s", r)
-                out.append({"error": str(r)})
-            else:
-                out.append(r)
-        return out
-
-    ############################################################################
-    # MAIN LOOP
-    ############################################################################
-    async def _run_loop(self):
+    async def _stream_target(self, name, base, session, apikey):
         while not self._stop.is_set():
-            metrics = await self._poll_all()
-
-            payload = {"type": "metrics", "ts": asyncio.get_event_loop().time(), "data": metrics}
-
-            for q in list(self._ws_subscribers):
-                try:
-                    q.put_nowait(payload)
-                except asyncio.QueueFull:
-                    try:
-                        _ = q.get_nowait()
-                        q.put_nowait(payload)
-                    except Exception:
-                        pass
-
-            await asyncio.sleep(self.poll_interval)
+            try:
+                async for payload in self._fetch_observability(session, base, apikey):
+                    result = {
+                        "type": "metrics",
+                        "ts": asyncio.get_event_loop().time(),
+                        "data": [{"name": name, "base_url": base, "metrics": payload}],
+                    }
+
+                    # The queue gets full when subscribers aren’t reading fast enough
+                    # [OR]
+                    # The monitor produces new metrics faster than the queue’s fixed maxsize of 10 can be consumed
+                    for q in list(self._ws_subscribers):
+                        try:
+                            q.put_nowait(result)
+                        except asyncio.QueueFull:
+                            try:
+                                _ = q.get_nowait()
+                                q.put_nowait(result)
+                            except Exception as debug:
+                                LOGGER.debug(f"Queue full: {debug}")
+            except Exception as debug:
+                LOGGER.debug(f"Stream failed for {base}, retrying: {debug}")
+            await asyncio.sleep(1)

pyobservability/static/app.js

@@ -12,8 +12,10 @@
   const nodeSelect = document.getElementById("node-select");
   const refreshBtn = document.getElementById("refresh-btn");
 
-  const ipEl = document.getElementById("ip");
-  const gpuEl = document.getElementById("gpu");
+  const systemEl = document.getElementById("system");
+  const ipEl = document.getElementById("ip-info");
+  const processorEl = document.getElementById("processor");
+
   const memEl = document.getElementById("memory");
   const diskEl = document.getElementById("disk");
   const loadEl = document.getElementById("cpuload");
@@ -27,12 +29,24 @@
   const servicesTableBody = document.querySelector("#services-table tbody");
   const svcFilter = document.getElementById("svc-filter");
 
+  const processesTableBody = document.querySelector("#processes-table tbody");
+  const procFilter = document.getElementById("proc-filter");
+
   const dockerTable = document.getElementById("docker-table");
   const dockerTableHead = dockerTable.querySelector("thead");
   const dockerTableBody = dockerTable.querySelector("tbody");
 
-  const disksTableBody = document.querySelector("#disks-table tbody");
-  const certsEl = document.getElementById("certificates");
+  const disksTable = document.getElementById("disks-table");
+  const disksTableHead = disksTable.querySelector("thead")
+  const disksTableBody = disksTable.querySelector("tbody");
+
+  const pyudiskTable = document.getElementById("pyudisk-table")
+  const pyudiskTableHead = pyudiskTable.querySelector("thead")
+  const pyudiskTableBody = pyudiskTable.querySelector("tbody")
+
+  const certsTable = document.getElementById("certificates-table")
+  const certsTableHead = certsTable.querySelector("thead");
+  const certsTableBody = certsTable.querySelector("tbody");
 
   const showCoresCheckbox = document.getElementById("show-cores");
 
@@ -176,17 +190,27 @@
     }
 
     // Reset static UI fields
+    systemEl.textContent = "-";
     ipEl.textContent = "—";
-    gpuEl.textContent = "—";
+    processorEl.textContent = "—";
     memEl.textContent = "—";
     diskEl.textContent = "—";
     loadEl.textContent = "—";
 
     servicesTableBody.innerHTML = "";
+    processesTableBody.innerHTML = "";
+
     dockerTableHead.innerHTML = "";
     dockerTableBody.innerHTML = "";
+
+    disksTableHead.innerHTML = "";
     disksTableBody.innerHTML = "";
-    certsEl.textContent = "—";
+
+    pyudiskTableHead.innerHTML = "";
+    pyudiskTableBody.innerHTML = "";
+
+    certsTableHead.innerHTML = "";
+    certsTableBody.innerHTML = "";
   }
 
   // ------------------------------------------------------------
@@ -210,19 +234,56 @@
     return Number.isFinite(n) ? n : null;
   }
 
-  function formatStringOrObject(x) {
-    if (x == null) return "—";
-    if (typeof x === "string" || typeof x === "number") return x;
-    return Object.entries(x)
-      .map(([k,v]) => `${k}: ${v}`)
-      .join("\n");
-  }
-
   function round2(x) {
     const n = Number(x);
     return Number.isFinite(n) ? n.toFixed(2) : "—";
   }
 
+  function formatBytes(x) {
+    if (x == null) return "—";
+    const units = ["B","KB","MB","GB","TB"];
+    let i = 0;
+    let n = Number(x);
+    while (n > 1024 && i < units.length-1) {
+      n /= 1024;
+      i++;
+    }
+    return n.toFixed(2) + " " + units[i];
+  }
+
+  function tableConstructor(dataList, tableHead, tableBody) {
+    tableHead.innerHTML = "";
+    tableBody.innerHTML = "";
+
+    if (!Array.isArray(dataList) || dataList.length === 0) {
+      tableBody.innerHTML = `<tr><td colspan="10">NO DATA</td></tr>`;
+    } else {
+      const columns = Object.keys(dataList[0]);
+      tableHead.innerHTML =
+        "<tr>" + columns.map(c => `<th>${c}</th>`).join("") + "</tr>";
+      dataList.forEach(c => {
+        const row = "<tr>" +
+          columns.map(col => `<td>${c[col] ?? ""}</td>`).join("") +
+          "</tr>";
+        tableBody.insertAdjacentHTML("beforeend", row);
+      });
+    }
+  }
+
+  function objectToString(...vals) {
+    for (const v of vals) {
+      if (v !== undefined && v !== null) {
+        if (typeof v === "object") {
+          return Object.entries(v)
+            .map(([k, val]) => `${k}: ${val}`)
+            .join("<br>");
+        }
+        return String(v);
+      }
+    }
+    return "—";
+  }
+
   // ------------------------------------------------------------
   // METRICS HANDLER
   // ------------------------------------------------------------
@@ -233,39 +294,95 @@
       if (host.base_url !== selectedBase) continue;
       const m = host.metrics || {};
 
-      // ------------------- BASIC INFO -------------------
-      ipEl.textContent = m.ip?.ip || m.ip || "—";
-      gpuEl.textContent = formatStringOrObject(m.gpu ?? m.cpu ?? "—");
-      if (m.disk) {
-        const total = m.disk.total ?? "—";
-        const used  = m.disk.used ?? "—";
-        const free  = m.disk.free ?? "—";
-        diskEl.textContent = `Total: ${total}\nUsed: ${used}\nFree: ${free}`;
+      // ------------------- System -------------------
+      systemEl.textContent =
+        `Node: ${m.node || "-"}\n` +
+        `OS: ${m.system || "-"}\n` +
+        `Architecture: ${m.architecture || "-"}\n\n` +
+        `CPU Cores: ${m.cores || "-"}\n` +
+        `Up Time: ${m.uptime || "-"}\n`;
+
+      // ------------------- IP -------------------
+      if (m.ip_info) {
+        ipEl.textContent =
+          `Private: ${m.ip_info.private || "-"}\n\n` +
+          `Public: ${m.ip_info.public || "-"}`;
+      } else {
+        ipEl.textContent = "-";
+      }
+
+      // ------------------- CPU / GPU -------------------
+      processorEl.textContent =
+        `CPU: ${m.cpu_name || "-"}\n\n` +
+        `GPU: ${m.gpu_name || "-"}`;
+
+      // ------------------- DISKS (OLD “disk” card) -------------------
+      if (Array.isArray(m.disk_info) && m.disk_info.length > 0) {
+        const d = m.disk_info[0];
+        diskEl.textContent =
+          `Total: ${formatBytes(d.total)}\n` +
+          `Used: ${formatBytes(d.used)}\n` +
+          `Free: ${formatBytes(d.free)}`;
+      } else if (m.disk) {
+        diskEl.textContent =
+          `Total: ${m.disk.total}\nUsed: ${m.disk.used}\nFree: ${m.disk.free}`;
       } else {
-        diskEl.textContent = "—";
+        diskEl.textContent = "NO DATA";
       }
 
       // ------------------- MEMORY -------------------
-      if (m.memory) {
-        const used = m.memory.ram_used || m.memory.used || "";
-        const percent = m.memory.ram_usage ?? m.memory.usage ?? m.memory.percent ?? "—";
+      if (m.memory_info) {
+        const total = formatBytes(m.memory_info.total);
+        const used  = formatBytes(m.memory_info.used);
+        const percent = round2(m.memory_info.percent);
+
+        memEl.textContent = `Total: ${total}\nUsed: ${used}\nPercent: ${percent}%`;
+        pushPoint(memChart, num(m.memory_info.percent));
+
+      } else if (m.memory) {
+        // fallback to old
+        const used = m.memory.ram_used || "";
+        const percent = m.memory.ram_usage ?? m.memory.percent ?? "—";
         const totalMem = m.memory.ram_total ?? m.memory.total ?? "—";
         memEl.textContent = `Total: ${totalMem}\nUsed: ${used}\nPercent: ${percent}%`;
         pushPoint(memChart, num(percent));
+      } else {
+        memEl.textContent = "NO DATA";
       }
 
-      // ------------------- CPU -------------------
+      // ------------------- CPU (NEW — cpu_usage[]) -------------------
       let avg = null;
 
-      if (m.cpu) {
-        const detail = m.cpu.detail || m.cpu;
+      if (Array.isArray(m.cpu_usage)) {
+        const values = m.cpu_usage.map(num);
+        avg = values.reduce((a, b) => a + (b ?? 0), 0) / values.length;
+
+        pruneOldCores(values.map((_, i) => "cpu" + (i + 1)));
+
+        values.forEach((v, i) => {
+          const coreName = "cpu" + (i + 1);
+          const c = getCoreChart(coreName);
+
+          c.chart.data.labels.push(now);
+          c.chart.data.datasets[0].data.push(v ?? 0);
+
+          if (c.chart.data.labels.length > MAX_POINTS) {
+            c.chart.data.labels.shift();
+            c.chart.data.datasets[0].data.shift();
+          }
+
+          c.chart.update("none");
+          c.valEl.textContent = `${(v ?? 0).toFixed(1)}%`;
+        });
 
+      } else if (m.cpu) {
+        // fallback to old
+        const detail = m.cpu.detail || m.cpu;
         if (typeof detail === "object") {
           const names = Object.keys(detail);
           pruneOldCores(names);
 
           const values = [];
-
           for (const [core, val] of Object.entries(detail)) {
             const v = num(val);
             values.push(v);
@@ -282,97 +399,94 @@
             c.chart.update("none");
             c.valEl.textContent = `${(v ?? 0).toFixed(1)}%`;
           }
-
           avg = values.reduce((a, b) => a + (b ?? 0), 0) / values.length;
         }
-        else if (typeof detail === "number") {
-          avg = detail;
-        }
       }
 
       if (avg != null) pushPoint(cpuAvgChart, avg);
 
       // ------------------- CPU LOAD -------------------
-      if (m.cpu_load) {
+      if (m.load_averages) {
+        const la = m.load_averages;
+        loadEl.textContent =
+          `${round2(la.m1)} / ${round2(la.m5)} / ${round2(la.m15)}`;
+        pushPoint(loadChart, num(la.m1));
+      } else if (m.cpu_load) {
         const load = m.cpu_load.detail || m.cpu_load;
-        if (typeof load === "object") {
-          const m1  = load.m1 ?? load[0];
-          const m5  = load.m5 ?? load[1];
-          const m15 = load.m15 ?? load[2];
-
-          loadEl.textContent = `${round2(m1)} / ${round2(m5)} / ${round2(m15)}`;
-          pushPoint(loadChart, num(m1) ?? 0);
-        } else {
-          loadEl.textContent = load;
-          pushPoint(loadChart, num(load));
-        }
+        const m1 = load.m1 ?? load[0];
+        const m5 = load.m5 ?? load[1];
+        const m15 = load.m15 ?? load[2];
+        loadEl.textContent = `${round2(m1)} / ${round2(m5)} / ${round2(m15)}`;
+        pushPoint(loadChart, num(m1));
+      } else {
+        loadEl.textContent = "NO DATA";
       }
 
-      // ------------------- SERVICES -------------------
-      if (Array.isArray(m.services)) {
+      // ------------------- SERVICES (NEW → OLD) -------------------
+      const services = m.service_stats || m.services || [];
+      servicesTableBody.innerHTML = "";
+      if (Array.isArray(services)) {
         const filter = svcFilter.value.trim().toLowerCase();
-        servicesTableBody.innerHTML = "";
-
-        for (const s of m.services) {
-          const name = s.pname || s.label || s.name || "";
+        for (const s of services) {
+          const name = s.pname || s.Name || "";
 
           if (filter && !name.toLowerCase().includes(filter)) continue;
 
           const tr = document.createElement("tr");
           tr.innerHTML = `
-            <td>${s.pid ?? s.PID ?? ""}</td>
+            <td>${s.PID ?? ""}</td>
             <td>${name}</td>
-            <td>${s.status ?? "—"}</td>
-            <td>${s.cpu ? JSON.stringify(s.cpu) : "—"}</td>
-            <td>${s.memory ? (s.memory.rss || s.memory.pfaults || JSON.stringify(s.memory)) : "—"}</td>
+            <td>${s.Status ?? s.status ?? "—"}</td>
+            <td>${objectToString(s.CPU, s.cpu)}</td>
+            <td>${objectToString(s.Memory, s.memory)}</td>
+            <td>${s.Threads ?? s.threads ?? "—"}</td>
+            <td>${s["Open Files"] ?? s.open_files ?? "—"}</td>
           `;
           servicesTableBody.appendChild(tr);
         }
       }
 
-      // ------------------- DOCKER -------------------
-      const dockerList = m.docker_stats;
-
-      if (Array.isArray(dockerList) && dockerTableHead && dockerTableBody) {
-        dockerTableHead.innerHTML = "";
-        dockerTableBody.innerHTML = "";
-
-        if (dockerList.length > 0) {
-          // Table header
-          const columns = Object.keys(dockerList[0]);
-          dockerTableHead.innerHTML =
-            "<tr>" + columns.map(c => `<th>${c}</th>`).join("") + "</tr>";
-
-          // Table rows
-          dockerList.forEach(c => {
-            const row = "<tr>" +
-              columns.map(col => `<td>${c[col] ?? ""}</td>`).join("") +
-              "</tr>";
-            dockerTableBody.insertAdjacentHTML("beforeend", row);
-          });
-        }
-      } else {
-        console.warn("Cannot render Docker table:", dockerList, dockerTableHead, dockerTableBody);
-      }
+      // ------------------- PROCESSES (NEW → OLD) -------------------
+      const processes = m.process_stats || [];
+      processesTableBody.innerHTML = "";
+      if (Array.isArray(processes)) {
+        const filter = procFilter.value.trim().toLowerCase();
+        for (const p of processes) {
+          const name = p.Name || "";
+
+          if (filter && !name.toLowerCase().includes(filter)) continue;
 
-      // ------------------- DISKS -------------------
-      if (Array.isArray(m.disks)) {
-        disksTableBody.innerHTML = "";
-        for (const d of m.disks) {
           const tr = document.createElement("tr");
           tr.innerHTML = `
-            <td>${d.name || d.device_id || ""}</td>
-            <td>${d.size || d.total || ""}</td>
-            <td>${(d.mountpoints || []).join(", ")}</td>
+            <td>${p.PID ?? ""}</td>
+            <td>${name}</td>
+            <td>${p.Status ?? p.status ?? "—"}</td>
+            <td>${p.CPU ?? p.cpu ?? "—"}</td>
+            <td>${p.Memory ?? p.memory ?? "—"}</td>
+            <td>${p.Uptime ?? p.uptime ?? "—"}</td>
+            <td>${p.Threads ?? p.threads ?? "—"}</td>
+            <td>${p["Open Files"] ?? p.open_files ?? "—"}</td>
           `;
-          disksTableBody.appendChild(tr);
+          processesTableBody.appendChild(tr);
         }
       }
 
+      // ------------------- DOCKER -------------------
+      const dockerList = m.docker_stats || [];
+      tableConstructor(dockerList, dockerTableHead, dockerTableBody);
+
+      // ------------------- DISKS (Tables) -------------------
+      // TOOD: Remove disk list when pyudisk is available
+      const diskList = m.disks_info || [];
+      tableConstructor(diskList, disksTableHead, disksTableBody);
+
+      // ------------------- PyUdisk (Tables) -------------------
+      const pyudiskList = m.pyudisk_stats || [];
+      tableConstructor(pyudiskList, pyudiskTableHead, pyudiskTableBody);
+
       // ------------------- CERTIFICATES -------------------
-      if (m.certificates) {
-        certsEl.textContent = JSON.stringify(m.certificates, null, 2);
-      }
+      const certsList = m.certificates || [];
+      tableConstructor(certsList, certsTableHead, certsTableBody);
     }
   }
 

pyobservability/static/styles.css

@@ -21,7 +21,8 @@ html,body { height:100%; margin:0; font-family: Inter, system-ui, -apple-system,
 
 .container { padding:18px; display:flex; flex-direction:column; gap:16px; max-width:1200px; margin:0 auto; }
 
-.meta-row { display:flex; gap:12px; }
+.meta-row { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; }
+/* .meta-row { display:flex; gap:12px; } */
 .meta-card { background:var(--panel); padding:12px; border-radius:8px; width:1fr; min-width:120px; flex:1; box-shadow:0 4px 12px rgba(2,6,23,0.6); }
 .meta-title { font-size:12px; color:var(--muted); }
 .meta-value { margin-top:6px; font-weight:600; font-size:16px; }
@@ -52,9 +53,11 @@ html,body { height:100%; margin:0; font-family: Inter, system-ui, -apple-system,
 .footer { padding:12px 20px; font-size:12px; color:var(--muted); text-align:center; border-top:1px solid rgba(255,255,255,0.02); margin-top:20px; }
 .service-controls { display:flex; gap:8px; padding-bottom:8px; }
 input#svc-filter { flex:1; padding:6px 8px; background:var(--panel); border:1px solid rgba(255,255,255,0.04); color:inherit; border-radius:6px; }
+input#proc-filter { flex:1; padding:6px 8px; background:var(--panel); border:1px solid rgba(255,255,255,0.04); color:inherit; border-radius:6px; }
 
 @media (max-width:900px) {
   .tables-row { grid-template-columns: 1fr; }
   .charts-row { flex-direction:column; }
   .details-row { flex-direction:column; }
+  .meta-row { grid-template-columns: 1fr; }
 }

pyobservability/templates/index.html

@@ -21,19 +21,24 @@
 
   <main class="container">
     <section class="meta-row">
+      <div class="meta-card">
+        <div class="meta-title">System</div>
+        <div id="system" class="meta-value pre">—</div>
+      </div>
+
       <div class="meta-card">
         <div class="meta-title">IP</div>
-        <div id="ip" class="meta-value">—</div>
+        <div id="ip-info" class="meta-value pre">—</div>
       </div>
 
       <div class="meta-card">
         <div class="meta-title">GPU / CPU Model</div>
-        <div id="gpu" class="meta-value pre">—</div>
+        <div id="processor" class="meta-value pre">—</div>
       </div>
 
       <div class="meta-card">
         <div class="meta-title">CPU Load (1/5/15)</div>
-        <div id="cpuload" class="meta-value">—</div>
+        <div id="cpuload" class="meta-value pre">—</div>
       </div>
 
       <div class="meta-card">
@@ -83,7 +88,19 @@
           <input id="svc-filter" placeholder="filter service name..." />
         </div>
         <table class="table" id="services-table">
-          <thead><tr><th>PID</th><th>Name</th><th>Status</th><th>CPU</th><th>Memory</th></tr></thead>
+          <thead><tr><th>PID</th><th>Name</th><th>Status</th><th>CPU</th><th>Memory</th><th>Threads</th><th>Open Files</th></tr></thead>
+          <tbody></tbody>
+        </table>
+      </div>
+
+    <section class="tables-row">
+      <div class="panel">
+        <div class="panel-header"><h3>Processes</h3></div>
+        <div class="panel-body service-controls">
+          <input id="proc-filter" placeholder="filter process name..." />
+        </div>
+        <table class="table" id="processes-table">
+          <thead><tr><th>PID</th><th>Name</th><th>Status</th><th>CPU</th><th>Memory</th><th>Uptime</th><th>Threads</th><th>Open Files</th></tr></thead>
           <tbody></tbody>
         </table>
       </div>
@@ -102,7 +119,17 @@
         <div class="panel-header"><h3>Disks</h3></div>
         <div class="panel-body">
           <table class="table" id="disks-table">
-            <thead><tr><th>Name</th><th>Size</th><th>Mounts</th></tr></thead>
+            <thead></thead>
+            <tbody></tbody>
+          </table>
+        </div>
+      </div>
+
+      <div class="panel">
+        <div class="panel-header"><h3>PyUdisk</h3></div>
+        <div class="panel-body">
+          <table class="table" id="pyudisk-table">
+            <thead></thead>
             <tbody></tbody>
           </table>
         </div>
@@ -111,12 +138,16 @@
       <div class="panel">
         <div class="panel-header"><h3>Certificates</h3></div>
         <div class="panel-body">
-          <pre id="certificates" class="pre">—</pre>
+          <table class="table" id="certificates-table">
+            <thead></thead>
+            <tbody></tbody>
+          </table>
         </div>
       </div>
     </section>
   </main>
 
+  <!-- TODO: Remove or provide context -->
   <footer class="footer">
     <div>OpenAPI: <code>/static/openapi.json</code> (uploaded file available at <code>/mnt/data/openapi.json</code>)</div>
   </footer>

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "0.0.2"
+__version__ = "0.1.0"

{pyobservability-0.0.2.dist-info → pyobservability-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 0.0.2
+Version: 0.1.0
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License

pyobservability-0.1.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+pyobservability/__init__.py,sha256=rr4udGMbbNPl3yo7l8R3FUUVVahBtYVaW6vSWWgXlv0,2617
+pyobservability/main.py,sha256=HpKYxQ3XgyvxRP6giVOBIpBYTptZ-txL98KV5D5P8uI,3623
+pyobservability/monitor.py,sha256=wu-CYsMCMQ1wZLTBaIyYLdu2FJvQ4rb41Lv2NEJ3yKM,4759
+pyobservability/version.py,sha256=kUR5RAFc7HCeiqdlX36dZOHkUI5wI6V_43RpEcD8b-0,22
+pyobservability/config/enums.py,sha256=iMIOpa8LYSszkPIYBhupX--KrEXVTTsBurinpAxLvMA,86
+pyobservability/config/settings.py,sha256=HoDRuzwCCbCdNQLdOiy9JUoiM2BqUsRkX6zUyDLordY,3811
+pyobservability/static/app.js,sha256=QQJ-1m7zwKQZz7nWTACS97mF79WGCXl5pNNQDWLmByM,17663
+pyobservability/static/styles.css,sha256=ljK6m-q7GMZkhiYQ9bqqR1NbYu2pRXzlvNTol_PK9go,3521
+pyobservability/templates/index.html,sha256=di7LKLVf3Ri0nxUn6dXVXlVPomQSRzZgWvNfTfxQb8s,5035
+pyobservability-0.1.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-0.1.0.dist-info/METADATA,sha256=nDYtRE5m3gCHwO8LI7F0w1B1qy7sLLjHTg7hQfD8RLA,6822
+pyobservability-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyobservability-0.1.0.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-0.1.0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-0.1.0.dist-info/RECORD,,

pyobservability-0.0.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-pyobservability/__init__.py,sha256=rr4udGMbbNPl3yo7l8R3FUUVVahBtYVaW6vSWWgXlv0,2617
-pyobservability/main.py,sha256=QCoALD_vk3S5XKEIwMI_LzfNixzq7xpIS0uA21uMqs0,3414
-pyobservability/monitor.py,sha256=s2sVp97sLjkkdtL6be82bX5ydu_gBdMSoWxDlmUtpgE,6613
-pyobservability/version.py,sha256=QvlVh4JTl3JL7jQAja76yKtT-IvF4631ASjWY1wS6AQ,22
-pyobservability/config/enums.py,sha256=iMIOpa8LYSszkPIYBhupX--KrEXVTTsBurinpAxLvMA,86
-pyobservability/config/settings.py,sha256=HoDRuzwCCbCdNQLdOiy9JUoiM2BqUsRkX6zUyDLordY,3811
-pyobservability/static/app.js,sha256=poc7eReoiRUbyI5JKnPwxSqmSNCuOge4aZKCITFy7eo,13494
-pyobservability/static/styles.css,sha256=t6r1C0ueBanipgRRjdu18nmq6RbSGLK5bhpf0BdMOpQ,3245
-pyobservability/templates/index.html,sha256=PsN3aq-7Q6RzGeshoNH5v37G3sHoI2saJq6mfuA6JYs,3977
-pyobservability-0.0.2.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-0.0.2.dist-info/METADATA,sha256=EDg-mzHBxxLTq93gbc1WhIKE3d0B_d_nXhSgiuO6sJI,6822
-pyobservability-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyobservability-0.0.2.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
-pyobservability-0.0.2.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-0.0.2.dist-info/RECORD,,