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

pyobservability/static/app.js

@@ -5,7 +5,7 @@
     // ------------------------------------------------------------
     const MAX_POINTS = 60;
     const targets = window.MONITOR_TARGETS || [];
-    const DEFAULT_PAGE_SIZE = 15;
+    const DEFAULT_PAGE_SIZE = 10;
     const panelSpinners = {};
 
     // ------------------------------------------------------------
@@ -117,11 +117,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);
         }
 
@@ -377,7 +392,53 @@
     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 = [];
+    // TODO: Update colorPalette to use contrasting colors
     const colorPalette = ["#63b3ff", "#ff99c8", "#7dd3fc", "#fbbf24", "#a3e635", "#f87171", "#c084fc", "#38bdf8"];
     const nodeColor = {};
     const unifiedCharts = {memory: null, cpu: null, disk: null};
@@ -511,6 +572,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 +767,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 +1033,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;
-                }
-            });
-        }
+        });
     }
 
     // ------------------------------------------------------------

pyobservability/static/styles.css

@@ -201,6 +201,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 +435,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,

pyobservability/templates/index.html

@@ -98,7 +98,54 @@
                     <canvas id="unified-disk-chart" class="chart"></canvas>
                 </div>
             </div>
+            {# TODO: Make the following tables into multiple div containers #}
             <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>
 

pyobservability/version.py

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

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

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

pyobservability-1.4.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+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=BqOI5y46o1G1RWC9bF1DPL-YM68lGYPmZt1pn6FZFZs,22
+pyobservability/config/enums.py,sha256=EhvD9kB5EMW3ARxr5KmISmf-rP3D4IKqOIjw6Tb8SB8,294
+pyobservability/config/settings.py,sha256=ylhiT0SARHuzkyon_1otgsO74AfA6aiUKp5uczZQj08,5980
+pyobservability/static/app.js,sha256=l6m8mwEU4z5d2wQF7Fa6tFITW3HX3M5RaLhBJ0jFXrM,43322
+pyobservability/static/styles.css,sha256=DRJ4kw-LDlXMcQXxFd8cEDuDC_ZfwZgARAjn0zDWwRk,8172
+pyobservability/templates/index.html,sha256=Z_r1Gq0QNxEwTL4_2NPQ1cKqLpbQoJC88E5leyjo07s,10786
+pyobservability-1.4.1.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-1.4.1.dist-info/METADATA,sha256=QUIDftx5D229DYD03NsspRYP2Imp0u_rVVlzW4-UPHo,6537
+pyobservability-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyobservability-1.4.1.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-1.4.1.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-1.4.1.dist-info/RECORD,,

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,,