PyObservability 1.4.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

pyobservability/config/enums.py

@@ -9,6 +9,7 @@ class APIEndpoints(StrEnum):
     """
 
     health = "/health"
+    kuma = "/kuma"
     root = "/"
     ws = "/ws"
 

pyobservability/config/settings.py

@@ -132,6 +132,11 @@ class EnvConfig(PydanticEnvConfig):
     password: str | None = Field(None, validation_alias=alias_choices("PASSWORD"))
     timeout: PositiveInt = Field(300, validation_alias=alias_choices("TIMEOUT"))
 
+    kuma_url: str | None = None
+    kuma_username: str | None = None
+    kuma_password: str | None = None
+    kuma_timeout: PositiveInt = 5
+
     class Config:
         """Environment variables configuration."""
 

pyobservability/kuma.py

@@ -0,0 +1,126 @@
+import logging
+import time
+from collections import defaultdict
+from typing import Any, Dict, List
+from urllib.parse import urlparse
+
+import socketio
+
+from pyobservability.config import settings
+
+LOGGER = logging.getLogger("uvicorn.default")
+
+
+class UptimeKumaClient:
+    """Client to interact with Uptime Kuma server via Socket.IO.
+
+    >>> UptimeKumaClient
+
+    """
+
+    def __init__(self):
+        """Initialize the Uptime Kuma client."""
+        self.sio = socketio.Client()
+        self.monitors = {}
+        self.logged_in = False
+
+        self.sio.on("monitorList", self._on_monitor_list)
+
+    def _on_monitor_list(self, data):
+        """Handle incoming monitor list from Uptime Kuma server."""
+        LOGGER.debug("Received monitor list from Uptime Kuma server.")
+        self.monitors = data
+
+    def connect(self):
+        """Connect to the Uptime Kuma server via Socket.IO."""
+        LOGGER.debug("Connecting to Uptime Kuma server at %s", settings.env.kuma_url)
+        self.sio.connect(settings.env.kuma_url)
+
+    def login(self):
+        """Log in to the Uptime Kuma server."""
+        result = {"ok": False}
+
+        def callback(resp):
+            """Callback to handle login response."""
+            result.update(resp or {"ok": False})
+
+        self.sio.emit(
+            "login",
+            {
+                "username": settings.env.kuma_username,
+                "password": settings.env.kuma_password,
+                "token": "",
+            },
+            callback=callback,
+        )
+
+        end = time.time() + settings.env.kuma_timeout
+        while not result.get("ok") and time.time() < end:
+            time.sleep(0.05)
+
+        if not result.get("ok"):
+            raise RuntimeError("Uptime Kuma login failed")
+
+        self.logged_in = True
+
+    def get_monitors(self):
+        """Retrieve monitors from the Uptime Kuma server."""
+        if not self.sio.connected:
+            self.connect()
+
+        if not self.logged_in:
+            self.login()
+
+        end = time.time() + settings.env.kuma_timeout
+        while not self.monitors and time.time() < end:
+            time.sleep(0.05)
+
+        if not self.monitors:
+            raise RuntimeError("No monitors received")
+
+        return self.monitors
+
+
+async def extract_monitors(payload: Dict[int, Dict[str, Any]]) -> List[Dict[str, Any]]:
+    """Convert raw API payload into a list of dicts with name, url, tag_names, host.
+
+    Args:
+        payload: Raw payload from Uptime Kuma server.
+
+    Returns:
+        List[Dict[str, Any]]:
+        List of monitors with relevant fields.
+    """
+    monitors = []
+
+    grouped = {}
+    for monitor in payload.values():
+        if children_ids := monitor.get("childrenIDs"):
+            for child in children_ids:
+                grouped[child] = monitor.get("name")
+
+    for monitor in payload.values():
+        url = monitor.get("url").replace("host.docker.internal", urlparse(settings.env.kuma_url).hostname)
+        host = urlparse(url).hostname if url else None
+        if not host:
+            continue
+        monitors.append(
+            {
+                "name": monitor.get("name"),
+                "parent": grouped.get(monitor.get("id")),
+                "url": url,
+                "host": host,
+                "tag_names": [tag.get("name") for tag in monitor.get("tags", []) if "name" in tag],
+            }
+        )
+    return monitors
+
+
+async def group_by_host(monitors: List[Dict[str, Any]]) -> Dict[str, Any]:
+    """Group monitors by host."""
+    grouped = defaultdict(list)
+
+    for monitor in monitors:
+        grouped[monitor["host"]].append(monitor)
+
+    return dict(grouped)

pyobservability/main.py

@@ -2,16 +2,18 @@ import logging
 import pathlib
 import warnings
 from datetime import datetime
-from typing import Any, Dict
+from http import HTTPStatus
+from typing import Dict
 
 import uiauth
 import uvicorn
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, HTTPException, Request
 from fastapi.routing import APIRoute, APIWebSocketRoute
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
 from pyobservability.config import enums, settings
+from pyobservability.kuma import UptimeKumaClient, extract_monitors, group_by_host
 from pyobservability.transport import websocket_endpoint
 from pyobservability.version import __version__
 
@@ -39,12 +41,33 @@ async def index(request: Request):
         TemplateResponse:
         Rendered HTML template with targets and version.
     """
-    args: Dict[str, Any] = dict(request=request, targets=settings.env.targets, version=__version__)
+    kuma_data = {} if all((settings.env.kuma_url, settings.env.kuma_username, settings.env.kuma_password)) else None
+    args = dict(request=request, service_map=kuma_data, targets=settings.env.targets, version=__version__)
     if settings.env.username and settings.env.password:
         args["logout"] = uiauth.enums.APIEndpoints.fastapi_logout.value
     return templates.TemplateResponse("index.html", args)
 
 
+async def kuma():
+    """Kuma endpoint to retrieve monitors from Kuma server.
+
+    Returns:
+        Dict[str, Any]:
+        Grouped monitors by host from Kuma server.
+    """
+    try:
+        kuma_data = UptimeKumaClient().get_monitors()
+        LOGGER.info("Retrieved payload from kuma server.")
+    except RuntimeError:
+        raise HTTPException(
+            status_code=HTTPStatus.SERVICE_UNAVAILABLE.real,
+            detail="Unable to retrieve data from kuma server.",
+        )
+    json_monitors = await extract_monitors(kuma_data)
+    LOGGER.info("Extracted JSON monitors from kuma payload.")
+    return await group_by_host(json_monitors)
+
+
 async def health() -> Dict[str, str]:
     """Health check endpoint.
 
@@ -65,25 +88,35 @@ def include_routes() -> None:
             include_in_schema=False,
         ),
     )
+    kuma_enabled = all((settings.env.kuma_url, settings.env.kuma_username, settings.env.kuma_password))
     if all((settings.env.username, settings.env.password)):
+        auth_endpoints = [
+            uiauth.Parameters(
+                path=enums.APIEndpoints.root,
+                function=index,
+                methods=[uiauth.enums.APIMethods.GET],
+            ),
+            uiauth.Parameters(
+                path=enums.APIEndpoints.ws,
+                function=websocket_endpoint,
+                route=APIWebSocketRoute,
+            ),
+        ]
+        if kuma_enabled:
+            auth_endpoints.append(
+                uiauth.Parameters(
+                    path=enums.APIEndpoints.kuma,
+                    function=kuma,
+                    methods=[uiauth.enums.APIMethods.GET],
+                )
+            )
         uiauth.protect(
             app=PyObservability,
             username=settings.env.username,
             password=settings.env.password,
             timeout=settings.env.timeout,
             custom_logger=LOGGER,
-            params=[
-                uiauth.Parameters(
-                    path=enums.APIEndpoints.root,
-                    function=index,
-                    methods=[uiauth.enums.APIMethods.GET],
-                ),
-                uiauth.Parameters(
-                    path=enums.APIEndpoints.ws,
-                    function=websocket_endpoint,
-                    route=APIWebSocketRoute,
-                ),
-            ],
+            params=auth_endpoints,
         )
     else:
         warnings.warn("\n\tRunning PyObservability without any protection.", UserWarning)
@@ -99,10 +132,20 @@ def include_routes() -> None:
             APIWebSocketRoute(
                 path=enums.APIEndpoints.ws,
                 endpoint=websocket_endpoint,
-            )
+            ),
         )
+        if kuma_enabled:
+            PyObservability.routes.append(
+                APIRoute(
+                    path=enums.APIEndpoints.kuma,
+                    endpoint=kuma,
+                    methods=["GET"],
+                    include_in_schema=False,
+                ),
+            )
 
 
+# noinspection PyTypeChecker
 def start(**kwargs) -> None:
     """Start the FastAPI app with Uvicorn server."""
     settings.env = settings.env_loader(**kwargs)

pyobservability/static/app.js

@@ -5,9 +5,15 @@
     // ------------------------------------------------------------
     const MAX_POINTS = 60;
     const targets = window.MONITOR_TARGETS || [];
-    const DEFAULT_PAGE_SIZE = 15;
+    const DEFAULT_PAGE_SIZE = 10;
     const panelSpinners = {};
 
+    // Tab management
+    let currentTab = 'nodes';
+    let ws = null;
+    let kumaMapData = null;
+    let kumaMapLoaded = false;
+
     // ------------------------------------------------------------
     // VISUAL SPINNERS
     // ------------------------------------------------------------
@@ -88,6 +94,10 @@
     const certsTableHead = certsTable.querySelector("thead");
     const certsTableBody = certsTable.querySelector("tbody");
 
+    const endpointsTable = document.getElementById("endpoints-table");
+    const endpointsTableHead = endpointsTable.querySelector("thead");
+    const endpointsTableBody = endpointsTable.querySelector("tbody");
+
     const showCoresCheckbox = document.getElementById("show-cores");
 
     // ------------------------------------------------------------
@@ -117,11 +127,26 @@
             const chunk = rows.slice(start, start + state.pageSize);
 
             info.textContent =
-                `Showing ${start + 1} to ${Math.min(start + state.pageSize, rows.length)} of ${rows.length} entries`;
+                `Showing ${rows.length ? start + 1 : 0} to ${rows.length ? Math.min(start + state.pageSize, rows.length) : 0} of ${rows.length} entries`;
 
             bodyEl.innerHTML = "";
             chunk.forEach(r => bodyEl.insertAdjacentHTML("beforeend", r));
 
+            const fillerCount = Math.max(0, state.pageSize - chunk.length);
+            const shouldPad = state.page > 1 && fillerCount > 0;
+            if (shouldPad) {
+                const colCount = state.columns?.length || headEl.querySelectorAll("th").length || 1;
+                for (let i = 0; i < fillerCount; i++) {
+                    const fillerRow = document.createElement("tr");
+                    fillerRow.className = "placeholder-row";
+                    for (let c = 0; c < colCount; c++) {
+                        const cell = document.createElement("td");
+                        cell.innerHTML = "&nbsp;";
+                        fillerRow.appendChild(cell);
+                    }
+                    bodyEl.appendChild(fillerRow);
+                }
+            }
             renderPagination(pages);
         }
 
@@ -305,6 +330,11 @@
     const PAG_CERTS = createPaginatedTable(
         certsTable, certsTableHead, certsTableBody
     );
+    const PAG_ENDPOINTS = createPaginatedTable(
+        endpointsTable,
+        endpointsTableHead,
+        endpointsTableBody
+    );
 
     // ------------------------------------------------------------
     // CHART HELPERS
@@ -336,6 +366,32 @@
         });
     }
 
+    function normalizeServiceMap(serviceMap) {
+        const rows = [];
+        Object.entries(serviceMap || {}).forEach(([host, services]) => {
+            services.forEach(svc => {
+                rows.push({
+                    Node: host,
+                    Name: svc.name || "",
+                    Parent: svc.parent || "—",
+                    Tags: (svc.tag_names || []).join(", "),
+                    URL: `<a href="${svc.url}" target="_blank">${svc.url}</a>`
+                });
+            });
+        });
+        return rows;
+    }
+
+    function renderEndpoints() {
+        if (!window.SERVICE_MAP) return;
+
+        const rows = normalizeServiceMap(window.SERVICE_MAP);
+        const columns = ["Node", "Name", "Parent", "Tags", "URL"];
+
+        PAG_ENDPOINTS.setData(rows, columns);
+        hideSpinner("endpoints-table");
+    }
+
     function makeCoreSparkline(ctx, coreName) {
         const EMPTY_LABELS = Array(MAX_POINTS).fill("");
         const EMPTY_DATA = Array(MAX_POINTS).fill(null);
@@ -377,8 +433,62 @@
     const unifiedCpuCtx = document.getElementById("unified-cpu-chart").getContext("2d");
     const unifiedDiskCtx = document.getElementById("unified-disk-chart").getContext("2d");
 
+    // Unified tables DOM references
+    const unifiedServicesTable = document.getElementById("unified-services-table");
+    const unifiedServicesHead = unifiedServicesTable?.querySelector("thead");
+    const unifiedServicesBody = unifiedServicesTable?.querySelector("tbody");
+
+    const unifiedProcessesTable = document.getElementById("unified-processes-table");
+    const unifiedProcessesHead = unifiedProcessesTable?.querySelector("thead");
+    const unifiedProcessesBody = unifiedProcessesTable?.querySelector("tbody");
+
+    const unifiedDockerTable = document.getElementById("unified-docker-table");
+    const unifiedDockerHead = unifiedDockerTable?.querySelector("thead");
+    const unifiedDockerBody = unifiedDockerTable?.querySelector("tbody");
+
+    const unifiedDisksTable = document.getElementById("unified-disks-table");
+    const unifiedDisksHead = unifiedDisksTable?.querySelector("thead");
+    const unifiedDisksBody = unifiedDisksTable?.querySelector("tbody");
+
+    const unifiedPyudiskTable = document.getElementById("unified-pyudisk-table");
+    const unifiedPyudiskHead = unifiedPyudiskTable?.querySelector("thead");
+    const unifiedPyudiskBody = unifiedPyudiskTable?.querySelector("tbody");
+
+    const unifiedCertsTable = document.getElementById("unified-certificates-table");
+    const unifiedCertsHead = unifiedCertsTable?.querySelector("thead");
+    const unifiedCertsBody = unifiedCertsTable?.querySelector("tbody");
+
+    // Paginated unified tables
+    const PAG_UNIFIED_SERVICES = unifiedServicesTable && createPaginatedTable(
+        unifiedServicesTable, unifiedServicesHead, unifiedServicesBody
+    );
+    const PAG_UNIFIED_PROCESSES = unifiedProcessesTable && createPaginatedTable(
+        unifiedProcessesTable, unifiedProcessesHead, unifiedProcessesBody
+    );
+    const PAG_UNIFIED_DOCKER = unifiedDockerTable && createPaginatedTable(
+        unifiedDockerTable, unifiedDockerHead, unifiedDockerBody
+    );
+    const PAG_UNIFIED_DISKS = unifiedDisksTable && createPaginatedTable(
+        unifiedDisksTable, unifiedDisksHead, unifiedDisksBody
+    );
+    const PAG_UNIFIED_PYUDISK = unifiedPyudiskTable && createPaginatedTable(
+        unifiedPyudiskTable, unifiedPyudiskHead, unifiedPyudiskBody
+    );
+    const PAG_UNIFIED_CERTS = unifiedCertsTable && createPaginatedTable(
+        unifiedCertsTable, unifiedCertsHead, unifiedCertsBody
+    );
+
     let unifiedNodes = [];
-    const colorPalette = ["#63b3ff", "#ff99c8", "#7dd3fc", "#fbbf24", "#a3e635", "#f87171", "#c084fc", "#38bdf8"];
+    const colorPalette = [
+      "#ff0000",
+      "#ffff00",
+      "#00ff00",
+      "#0066ff",
+      "#b300ff",
+      "#ff7f00",
+      "#8b4513",
+      "#7f7f7f"
+    ];
     const nodeColor = {};
     const unifiedCharts = {memory: null, cpu: null, disk: null};
 
@@ -511,6 +621,147 @@
 
             chart.update("none");
         });
+
+        // --- Unified tables aggregation ---
+        // Helper to get display name for node
+        const getNodeLabel = (host) => host.name || host.base_url || "";
+
+        // Services
+        if (PAG_UNIFIED_SERVICES) {
+            const svcRows = [];
+            metrics.forEach(host => {
+                if (!host.metrics) return;
+                const m = host.metrics;
+                const label = getNodeLabel(host);
+                const services = (m.service_stats || m.services || []).filter(s =>
+                    (s.pname || s.Name || "").toLowerCase().includes(
+                        svcFilter.value.trim().toLowerCase()
+                    )
+                );
+                services.forEach(s => {
+                    svcRows.push({
+                        Node: label,
+                        PID: s.PID ?? s.pid ?? "",
+                        Name: s.pname ?? s.Name ?? s.name ?? "",
+                        Status: s.Status ?? s.active ?? s.status ?? s.Active ?? "4",
+                        CPU: objectToString(s.CPU, s.cpu),
+                        Memory: objectToString(s.Memory, s.memory),
+                        Threads: s.Threads ?? s.threads ?? "4",
+                        "Open Files": s["Open Files"] ?? s.open_files ?? "4"
+                    });
+                });
+            });
+            const svcCols = ["Node", "PID", "Name", "Status", "CPU", "Memory", "Threads", "Open Files"];
+            PAG_UNIFIED_SERVICES.setData(svcRows, svcCols);
+        }
+
+        // Processes
+        if (PAG_UNIFIED_PROCESSES) {
+            const procRows = [];
+            const procColsSet = new Set(["Node", "PID", "Name", "Status", "CPU", "Memory", "Uptime", "Threads", "Open Files"]);
+            metrics.forEach(host => {
+                if (!host.metrics) return;
+                const m = host.metrics;
+                const label = getNodeLabel(host);
+                const processes = (m.process_stats || []).filter(p =>
+                    (p.Name || "").toLowerCase().includes(
+                        procFilter.value.trim().toLowerCase()
+                    )
+                );
+                processes.forEach(p => {
+                    const row = {Node: label};
+                    Object.entries(p).forEach(([k, v]) => {
+                        procColsSet.add(k);
+                        row[k] = v;
+                    });
+                    procRows.push(row);
+                });
+            });
+            const procCols = Array.from(procColsSet);
+            PAG_UNIFIED_PROCESSES.setData(procRows, procCols);
+        }
+
+        // Docker
+        if (PAG_UNIFIED_DOCKER) {
+            const dockerRows = [];
+            const dockerColsSet = new Set(["Node"]);
+            metrics.forEach(host => {
+                if (!host.metrics || !Array.isArray(host.metrics.docker_stats)) return;
+                const label = getNodeLabel(host);
+                host.metrics.docker_stats.forEach(s => {
+                    const row = {Node: label};
+                    Object.entries(s).forEach(([k, v]) => {
+                        dockerColsSet.add(k);
+                        row[k] = v;
+                    });
+                    dockerRows.push(row);
+                });
+            });
+            const dockerCols = Array.from(dockerColsSet);
+            PAG_UNIFIED_DOCKER.setData(dockerRows, dockerCols);
+        }
+
+        // Disks
+        if (PAG_UNIFIED_DISKS) {
+            const diskRows = [];
+            const diskColsSet = new Set(["Node"]);
+            metrics.forEach(host => {
+                if (!host.metrics || !Array.isArray(host.metrics.disks_info)) return;
+                const label = getNodeLabel(host);
+                host.metrics.disks_info.forEach(d => {
+                    const row = {Node: label};
+                    Object.entries(d).forEach(([k, v]) => {
+                        if (k === "Node") return;
+                        diskColsSet.add(k);
+                        row[k] = v;
+                    });
+                    diskRows.push(row);
+                });
+            });
+            const diskCols = Array.from(diskColsSet);
+            PAG_UNIFIED_DISKS.setData(diskRows, diskCols);
+        }
+
+        // PyUdisk
+        if (PAG_UNIFIED_PYUDISK) {
+            const pyuRows = [];
+            const pyuColsSet = new Set(["Node"]);
+            metrics.forEach(host => {
+                if (!host.metrics || !Array.isArray(host.metrics.pyudisk_stats)) return;
+                const label = getNodeLabel(host);
+                host.metrics.pyudisk_stats.forEach(pyu => {
+                    const row = {Node: label};
+                    Object.entries(pyu).forEach(([k, v]) => {
+                        if (k === "Mountpoint") return;
+                        pyuColsSet.add(k);
+                        row[k] = v;
+                    });
+                    pyuRows.push(row);
+                });
+            });
+            const pyuCols = Array.from(pyuColsSet);
+            PAG_UNIFIED_PYUDISK.setData(pyuRows, pyuCols);
+        }
+
+        // Certificates
+        if (PAG_UNIFIED_CERTS) {
+            const certRows = [];
+            const certColsSet = new Set(["Node"]);
+            metrics.forEach(host => {
+                if (!host.metrics || !Array.isArray(host.metrics.certificates)) return;
+                const label = getNodeLabel(host);
+                host.metrics.certificates.forEach(c => {
+                    const row = {Node: label};
+                    Object.entries(c).forEach(([k, v]) => {
+                        certColsSet.add(k);
+                        row[k] = v;
+                    });
+                    certRows.push(row);
+                });
+            });
+            const certCols = Array.from(certColsSet);
+            PAG_UNIFIED_CERTS.setData(certRows, certCols);
+        }
     }
 
     // ------------------------------------------------------------
@@ -565,6 +816,12 @@
         PAG_DISKS.setData([], []);
         PAG_PYUDISK.setData([], []);
         PAG_CERTS.setData([], []);
+        if (PAG_UNIFIED_SERVICES) PAG_UNIFIED_SERVICES.setData([], []);
+        if (PAG_UNIFIED_PROCESSES) PAG_UNIFIED_PROCESSES.setData([], []);
+        if (PAG_UNIFIED_DOCKER) PAG_UNIFIED_DOCKER.setData([], []);
+        if (PAG_UNIFIED_DISKS) PAG_UNIFIED_DISKS.setData([], []);
+        if (PAG_UNIFIED_PYUDISK) PAG_UNIFIED_PYUDISK.setData([], []);
+        if (PAG_UNIFIED_CERTS) PAG_UNIFIED_CERTS.setData([], []);
     }
 
     function resetUI() {
@@ -825,20 +1082,15 @@
             }
         }
 
-        if (selectedBase === "*") {
-            if (ensureUnifiedChart(list)) {
-                updateUnified(list);
+        // When not in unified ("*") mode, ensure unified panel is hidden and charts cleared
+        unifiedPanel.classList.add("hidden");
+        unifiedNodes = [];
+        Object.keys(unifiedCharts).forEach(key => {
+            if (unifiedCharts[key]) {
+                unifiedCharts[key].destroy();
+                unifiedCharts[key] = null;
             }
-        } else {
-            unifiedPanel.classList.add("hidden");
-            unifiedNodes = [];
-            Object.keys(unifiedCharts).forEach(key => {
-                if (unifiedCharts[key]) {
-                    unifiedCharts[key].destroy();
-                    unifiedCharts[key] = null;
-                }
-            });
-        }
+        });
     }
 
     // ------------------------------------------------------------
@@ -879,29 +1131,147 @@
     });
 
     // ------------------------------------------------------------
-    // WEBSOCKET
+    // TAB MANAGEMENT
     // ------------------------------------------------------------
-    const protocol = location.protocol === "https:" ? "wss" : "ws";
-    const ws = new WebSocket(`${protocol}://${location.host}/ws`);
+    const nodesTab = document.getElementById("nodes-tab");
+    const kumaTab = document.getElementById("kuma-tab");
+    const kumaMainTable = document.getElementById("kuma-main-table");
+    const kumaMainThead = kumaMainTable.querySelector("thead");
+    const kumaMainTbody = kumaMainTable.querySelector("tbody");
+    const kumaSearchInput = document.getElementById("kuma-search-input");
+    const controlsDiv = document.querySelector(".controls");
+
+    // Create paginated table for kuma using existing infrastructure
+    const PAG_KUMA_TAB = createPaginatedTable(
+        kumaMainTable, kumaMainThead, kumaMainTbody, 20
+    );
 
-    ws.onopen = () => {
-        ws.send(JSON.stringify({type: "select_target", base_url: selectedBase}));
-    };
+    let allKumaRows = [];
+
+    function initWebSocket() {
+        if (ws) return;
+
+        const protocol = location.protocol === "https:" ? "wss" : "ws";
+        ws = new WebSocket(`${protocol}://${location.host}/ws`);
+
+        ws.onopen = () => {
+            ws.send(JSON.stringify({type: "select_target", base_url: selectedBase}));
+        };
+
+        ws.onmessage = evt => {
+            try {
+                const msg = JSON.parse(evt.data);
+                if (msg.type === "metrics") handleMetrics(msg.data);
+                if (msg.type === "error") alert(msg.message);
+            } catch (err) {
+                console.error("WS parse error:", err);
+            }
+        };
+
+        ws.onerror = (err) => {
+            console.error("WebSocket error:", err);
+        };
+
+        ws.onclose = () => {
+            console.log("WebSocket closed");
+            ws = null;
+        };
+    }
+
+    function closeWebSocket() {
+        if (ws && ws.readyState === WebSocket.OPEN) {
+            ws.close();
+            ws = null;
+        }
+    }
+
+    async function loadKumaMap() {
+        if (kumaMapLoaded) {
+            PAG_KUMA_TAB.setData(allKumaRows, ["Node", "Name", "Parent", "Tags", "URL"]);
+            return;
+        }
+
+        // Show loading state
+        kumaMainThead.innerHTML = '<tr><th colspan="5">Loading...</th></tr>';
+        kumaMainTbody.innerHTML = '';
 
-    ws.onmessage = evt => {
         try {
-            const msg = JSON.parse(evt.data);
-            if (msg.type === "metrics") handleMetrics(msg.data);
-            if (msg.type === "error") alert(msg.message);
+            const response = await fetch('/kuma');
+            if (!response.ok) throw new Error('Failed to fetch service map');
+
+            kumaMapData = await response.json();
+            kumaMapLoaded = true;
+
+            allKumaRows = normalizeServiceMap(kumaMapData);
+            PAG_KUMA_TAB.setData(allKumaRows, ["Node", "Name", "Parent", "Tags", "URL"]);
         } catch (err) {
-            console.error("WS parse error:", err);
+            console.error("Error loading Kuma map:", err);
+            kumaMainThead.innerHTML = '<tr><th>Error</th></tr>';
+            kumaMainTbody.innerHTML = '<tr><td>Error loading Kuma endpoints. Please try again.</td></tr>';
         }
-    };
+    }
+
+    kumaSearchInput.addEventListener('input', (e) => {
+        const searchTerm = e.target.value.toLowerCase();
+
+        if (!searchTerm) {
+            PAG_KUMA_TAB.setData(allKumaRows, ["Node", "Name", "Parent", "Tags", "URL"]);
+        } else {
+            const filtered = allKumaRows.filter(row =>
+                row.Node.toLowerCase().includes(searchTerm) ||
+                row.Name.toLowerCase().includes(searchTerm) ||
+                row.Parent.toLowerCase().includes(searchTerm) ||
+                row.Tags.toLowerCase().includes(searchTerm) ||
+                row.URL.toLowerCase().includes(searchTerm)
+            );
+            PAG_KUMA_TAB.setData(filtered, ["Node", "Name", "Parent", "Tags", "URL"]);
+        }
+    });
+
+    function switchToNodesTab() {
+        currentTab = 'nodes';
+        nodesTab.classList.add('active');
+        kumaTab.classList.remove('active');
+        document.body.classList.remove('kuma-view');
+        document.body.classList.add('nodes-view');
+
+        controlsDiv.classList.remove('invisible');
+
+        closeWebSocket();
+        initWebSocket();
+    }
+
+    function switchToKumaTab() {
+        currentTab = 'kuma';
+        kumaTab.classList.add('active');
+        nodesTab.classList.remove('active');
+        document.body.classList.add('kuma-view');
+        document.body.classList.remove('nodes-view');
+
+        controlsDiv.classList.add('invisible');
+
+        closeWebSocket();
+        loadKumaMap();
+    }
+
+    if (nodesTab && kumaTab) {
+        nodesTab.addEventListener('click', switchToNodesTab);
+        kumaTab.addEventListener('click', switchToKumaTab);
+    }
+
+    // ------------------------------------------------------------
+    // WEBSOCKET (Managed by tabs)
+    // ------------------------------------------------------------
 
     // ------------------------------------------------------------
     // INIT
     // ------------------------------------------------------------
+    renderEndpoints();
     attachSpinners();
     resetUI();           // reset UI, keep spinners visible
     showAllSpinners();   // show spinners until first metrics arrive
+
+    // Initialize nodes view by default
+    document.body.classList.add('nodes-view');
+    initWebSocket();
 })();

pyobservability/static/styles.css

@@ -32,6 +32,34 @@ html, body {
     border-bottom: 1px solid rgba(255, 255, 255, 0.02);
 }
 
+.tab-navigation {
+    display: flex;
+    gap: 12px;
+    flex: 1;
+    justify-content: center;
+}
+
+.tab-btn {
+    background: transparent;
+    color: var(--muted);
+    border: none;
+    padding: 10px 32px;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
+    border-bottom: 3px solid transparent;
+    transition: all 0.2s;
+}
+
+.tab-btn:hover {
+    color: #e6eef8;
+}
+
+.tab-btn.active {
+    color: var(--accent);
+    border-bottom-color: var(--accent);
+}
+
 .brand {
     font-weight: 700;
     font-size: 18px;
@@ -41,6 +69,11 @@ html, body {
     display: flex;
     gap: 8px;
     align-items: center;
+    min-width: 300px; /* Maintain space even when hidden */
+}
+
+.controls.invisible {
+    visibility: hidden;
 }
 
 .controls select, .controls button {
@@ -201,6 +234,16 @@ html, body {
     text-align: left;
 }
 
+.table tbody tr.placeholder-row td {
+    color: transparent;
+    border-bottom: 1px solid transparent;
+    padding: 8px;
+}
+
+.table tbody tr.placeholder-row td::after {
+    content: "";
+}
+
 .pre {
     background: rgba(255, 255, 255, 0.02);
     padding: 8px;
@@ -425,6 +468,32 @@ input#proc-filter {
     font-size: 13px;
 }
 
+.unified-tables {
+    margin-top: 12px;
+}
+
+.unified-tables-title {
+    margin: 0 0 8px;
+    font-size: 13px;
+    color: var(--muted);
+}
+
+.unified-tables-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+}
+
+.unified-table-panel {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.unified-table-panel .table {
+    font-size: 12px;
+}
+
 body.unified-mode .meta-row,
 body.unified-mode .charts-row > :not(#unified-panel),
 body.unified-mode .details-row,
@@ -436,3 +505,42 @@ body.unified-mode footer {
 body.unified-mode #unified-panel {
     flex: 1;
 }
+
+/* Tab view controls */
+body.kuma-view .meta-row,
+body.kuma-view .charts-row,
+body.kuma-view .details-row,
+body.kuma-view .tables-row {
+    display: none !important;
+}
+
+body.kuma-view #kuma-content {
+    display: block !important;
+}
+
+body.nodes-view #kuma-content {
+    display: none !important;
+}
+
+#kuma-content {
+    display: none;
+}
+
+#kuma-content .panel {
+    max-width: 1400px;
+    margin: 0 auto;
+}
+
+.kuma-search {
+    margin-bottom: 12px;
+}
+
+.kuma-search input {
+    width: 100%;
+    padding: 10px 16px;
+    background: var(--glass);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    color: inherit;
+    border-radius: 6px;
+    font-size: 14px;
+}

pyobservability/templates/index.html

@@ -19,8 +19,15 @@
 <header class="topbar">
     <div class="brand">Node Monitor</div>
 
+    {% if service_map is not none %}
+    <div class="tab-navigation">
+        <button id="nodes-tab" class="tab-btn active">Nodes</button>
+        <button id="kuma-tab" class="tab-btn">Uptime Kuma</button>
+    </div>
+    {% endif %}
+
     <div class="controls">
-        <label for="node-select">Node:</label>
+        <label for="node-select" id="node-select-label">Node:</label>
         <select id="node-select" aria-label="Select node"></select>
         <button id="refresh-btn" title="Force refresh">Refresh</button>
         <button id="logout" title="Logout" onclick="logout()">Logout</button>
@@ -99,6 +106,52 @@
                 </div>
             </div>
             <div id="unified-legend" class="unified-legend"></div>
+            <div class="unified-tables">
+                <div class="unified-tables-grid">
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>Services</h3></div>
+                        <table class="table" id="unified-services-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>Processes</h3></div>
+                        <table class="table" id="unified-processes-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>Docker Containers</h3></div>
+                        <table class="table" id="unified-docker-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>Disks</h3></div>
+                        <table class="table" id="unified-disks-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>PyUdisk Metrics</h3></div>
+                        <table class="table" id="unified-pyudisk-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div class="panel unified-table-panel">
+                        <div class="panel-header"><h3>Certificates</h3></div>
+                        <table class="table" id="unified-certificates-table">
+                            <thead></thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
         </div>
     </section>
 
@@ -203,10 +256,32 @@
                     </table>
                 </div>
             </div>
+
+            <div class="panel">
+                <div class="panel-header"><h3>Kuma Endpoints</h3></div>
+                <div class="panel-body">
+                    <table class="table" id="endpoints-table">
+                        <thead></thead>
+                        <tbody></tbody>
+                    </table>
+                </div>
+            </div>
         </section>
     </section>
 </main>
 
+<div id="kuma-content" class="container">
+    <section class="panel">
+        <div class="kuma-search">
+            <input type="text" id="kuma-search-input" placeholder="Search Kuma endpoints by node, name, parent, or tags...">
+        </div>
+        <table class="table" id="kuma-main-table">
+            <thead></thead>
+            <tbody></tbody>
+        </table>
+    </section>
+</div>
+
 <footer class="footer">
     <div><code>PyObservability: v{{ version }}</code><br>
         <a href="https://github.com/thevickypedia/PyObservability" target="_blank">https://github.com/thevickypedia/PyObservability</a>
@@ -217,6 +292,13 @@
     // inject server-side targets
     window.MONITOR_TARGETS = {{ targets | tojson }};
 </script>
+
+{% if service_map is not none %}
+<script>
+    window.SERVICE_MAP = {{ service_map | tojson }};
+</script>
+{% endif %}
+
 <script>
     const logoutEndpoint = "{{ logout }}";
 

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "1.4.0"
+__version__ = "2.0.0"

{pyobservability-1.4.0.dist-info → pyobservability-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 1.4.0
+Version: 2.0.0
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -42,13 +42,16 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.13.*
-Requires-Dist: fastapi==0.122.*
+Requires-Dist: fastapi==0.128.*
 Requires-Dist: FastAPI-UI-Auth==0.2.1
 Requires-Dist: Jinja2==3.1.*
 Requires-Dist: pydantic==2.12.*
 Requires-Dist: pydantic-settings==2.12.*
 Requires-Dist: python-dotenv==1.2.*
-Requires-Dist: uvicorn[standard]==0.38.*
+Requires-Dist: python-socketio==5.16.*
+Requires-Dist: requests==2.32.*
+Requires-Dist: uvicorn[standard]==0.40.*
+Requires-Dist: websocket-client==1.9.*
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Dynamic: license-file
@@ -140,6 +143,13 @@ docker run \
 - **LOGS_PATH** - Directory path to store log files if `LOG` is set to `file`.
 - **LOG_CONFIG** - Path to a custom logging configuration file.
 
+**Uptime Kuma**
+> Uptime Kuma integration can be enabled by setting the following environment variables.
+- **KUMA_URL** - Base URL of the Uptime Kuma server.
+- **KUMA_USERNAME** - Username to authenticate with Uptime Kuma.
+- **KUMA_PASSWORD** - Password to authenticate with Uptime Kuma.
+- **KUMA_TIMEOUT** - Timeout (in seconds) for Uptime Kuma authentication. Defaults to 5s.
+
 ## License & copyright
 
 &copy; Vignesh Rao

pyobservability-2.0.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
+pyobservability/kuma.py,sha256=RL6ZsK6ZE3vUufsUQ3r4gnH8uka0k8ARd41GP5YozbU,3634
+pyobservability/main.py,sha256=EbP6xkOvj2cV1cOEmmq6E6QsLOhbvKI_jdpfcWjSz-M,6124
+pyobservability/monitor.py,sha256=i_Xf_DB-qLOp1b9wryekjwHIM8AnMrGTkuEg7e08bcM,7539
+pyobservability/transport.py,sha256=S-84mgf-9yMj0H7VSAmueW9yosX_1XxdyNJC2EuQHQQ,8493
+pyobservability/version.py,sha256=_7OlQdbVkK4jad0CLdpI0grT-zEAb-qgFmH5mFzDXiA,22
+pyobservability/config/enums.py,sha256=rQZh2Q4-9ItQTQgxsYjqw-jNePpWHhvQUrbrQJBG5CI,313
+pyobservability/config/settings.py,sha256=aCz1tZEg8fUA5gHCCDN_m3fgrH1axz2fvdalj4bszGs,6121
+pyobservability/static/app.js,sha256=lE-Oybq50FNr_0SrZJFiJihiXyIcyhw7-SNbGA81ySQ,48675
+pyobservability/static/styles.css,sha256=P6Xg-IAXO3WNeBLGH9Q5HAdNeDMRbFcM5P_cq60Jf00,9405
+pyobservability/templates/index.html,sha256=WQNOT_uHfAvVqOnYc1olYdyrjM11tDpeKwTkbPQ853Q,11834
+pyobservability-2.0.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-2.0.0.dist-info/METADATA,sha256=hu_7k6rRxUXitpfLhkAB6GZxMYQNDeqGaQAHJDKa0Ss,7026
+pyobservability-2.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyobservability-2.0.0.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-2.0.0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-2.0.0.dist-info/RECORD,,

{pyobservability-1.4.0.dist-info → pyobservability-2.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyobservability-1.4.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
-pyobservability/main.py,sha256=EJ49ENDnKy07jKHQ0IYEVmsyc_4O3uxCHpn1faQD5VM,4534
-pyobservability/monitor.py,sha256=i_Xf_DB-qLOp1b9wryekjwHIM8AnMrGTkuEg7e08bcM,7539
-pyobservability/transport.py,sha256=S-84mgf-9yMj0H7VSAmueW9yosX_1XxdyNJC2EuQHQQ,8493
-pyobservability/version.py,sha256=8UhoYEXHs1Oai7BW_ExBmuwWnRI-yMG_u1fQAXMizHQ,22
-pyobservability/config/enums.py,sha256=EhvD9kB5EMW3ARxr5KmISmf-rP3D4IKqOIjw6Tb8SB8,294
-pyobservability/config/settings.py,sha256=ylhiT0SARHuzkyon_1otgsO74AfA6aiUKp5uczZQj08,5980
-pyobservability/static/app.js,sha256=lel2ZZH-ifjehzy2d-5UQxOhnBIHxla05xjokW1nXXA,33919
-pyobservability/static/styles.css,sha256=0Vagj7nDac27JC0M870V3yqc1XN4rB5pDYuy4zjit3c,7618
-pyobservability/templates/index.html,sha256=JdGn7Bg9w-4zzcMzX78p0q5760ao7sioaqB1s_8d0Fs,8421
-pyobservability-1.4.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-1.4.0.dist-info/METADATA,sha256=DHbIRiPU0Vi_5PjsT0k5NgMInO8_YgY5azP9fGQM8VQ,6537
-pyobservability-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyobservability-1.4.0.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
-pyobservability-1.4.0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-1.4.0.dist-info/RECORD,,