Merge pull request #3020 from Dokploy/1735-bug-in-server-monitoring

chore: update node-os-utils to version 2.0.1 and refactor lodash imports

Author: Siumauricio

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import copy from "copy-to-clipboard";
-import { debounce } from "lodash";
+import _ from "lodash";
 import {
 	CheckIcon,
 	ChevronsUpDown,
@@ -236,7 +236,7 @@ export const RestoreBackup = ({
 	const currentDatabaseType = form.watch("databaseType");
 	const metadata = form.watch("metadata");
 
-	const debouncedSetSearch = debounce((value: string) => {
+	const debouncedSetSearch = _.debounce((value: string) => {
 		setDebouncedSearchTerm(value);
 	}, 350);
 

apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx

@@ -1,5 +1,5 @@
 import { FancyAnsi } from "fancy-ansi";
-import { escapeRegExp } from "lodash";
+import _ from "lodash";
 import { Badge } from "@/components/ui/badge";
 import {
 	Tooltip,
@@ -47,7 +47,7 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) {
 		}
 
 		const htmlContent = fancyAnsi.toHtml(text);
-		const searchRegex = new RegExp(`(${escapeRegExp(term)})`, "gi");
+		const searchRegex = new RegExp(`(${_.escapeRegExp(term)})`, "gi");
 
 		const modifiedContent = htmlContent.replace(
 			searchRegex,

apps/dokploy/package.json

@@ -120,7 +120,7 @@
 		"next": "^15.3.2",
 		"next-i18next": "^15.4.2",
 		"next-themes": "^0.2.1",
-		"node-os-utils": "1.3.7",
+		"node-os-utils": "2.0.1",
 		"node-pty": "1.0.0",
 		"node-schedule": "2.1.1",
 		"nodemailer": "6.9.14",
@@ -163,7 +163,6 @@
 		"@types/lodash": "4.17.4",
 		"@types/micromatch": "4.0.9",
 		"@types/node": "^18.19.104",
-		"@types/node-os-utils": "1.3.4",
 		"@types/node-schedule": "2.1.6",
 		"@types/nodemailer": "^6.4.17",
 		"@types/qrcode": "^1.5.5",

apps/dokploy/server/wss/docker-stats.ts

@@ -6,7 +6,9 @@ import {
 	recordAdvancedStats,
 	validateRequest,
 } from "@dokploy/server";
+import { OSUtils } from "node-os-utils";
 import { WebSocketServer } from "ws";
+import { formatBytes } from "@/components/dashboard/database/backups/restore-backup";
 
 export const setupDockerStatsMonitoringSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,
@@ -49,6 +51,83 @@ export const setupDockerStatsMonitoringSocketServer = (
 		}
 		const intervalId = setInterval(async () => {
 			try {
+				// Special case: when monitoring "dokploy", get host system stats instead of container stats
+				if (appName === "dokploy") {
+					const osutils = new OSUtils();
+
+					// Get CPU usage
+					const cpuResult = await osutils.cpu.usage();
+					const cpuUsage = cpuResult.success ? cpuResult.data : 0;
+
+					// Get memory info
+					const memResult = await osutils.memory.info();
+					let memUsedGB = 0;
+					let memTotalGB = 0;
+					let memUsedPercent = 0;
+					if (memResult.success) {
+						memTotalGB = memResult.data.total.toGB();
+						memUsedGB = memResult.data.used.toGB();
+						memUsedPercent = memResult.data.usagePercentage;
+					}
+
+					// Get network stats from network.overview() or network.statsAsync()
+					let netInputBytes = 0;
+					let netOutputBytes = 0;
+					const networkOverview = await osutils.network.overview();
+					if (networkOverview.success) {
+						netInputBytes = networkOverview.data.totalRxBytes.toBytes();
+						netOutputBytes = networkOverview.data.totalTxBytes.toBytes();
+					}
+
+					// Get Block I/O from disk.stats() (available in v2.0!)
+					// If disk.stats() doesn't work in container, fallback to /proc/diskstats
+					let blockReadBytes = 0;
+					let blockWriteBytes = 0;
+					const diskStats = await osutils.disk.stats();
+					if (diskStats.success && diskStats.data.length > 0) {
+						for (const stat of diskStats.data) {
+							blockReadBytes += stat.readBytes.toBytes();
+							blockWriteBytes += stat.writeBytes.toBytes();
+						}
+					}
+
+					// Format memory usage similar to docker stats format: "used / total"
+					const memUsedFormatted = `${memUsedGB.toFixed(2)}GiB`;
+					const memTotalFormatted = `${memTotalGB.toFixed(2)}GiB`;
+					const memUsageFormatted = `${memUsedFormatted} / ${memTotalFormatted}`;
+
+					// Format network I/O
+					const netInputMb = netInputBytes / (1024 * 1024);
+					const netOutputMb = netOutputBytes / (1024 * 1024);
+					const netIOFormatted = `${netInputMb.toFixed(2)}MB / ${netOutputMb.toFixed(2)}MB`;
+
+					// Format Block I/O
+					const blockIOFormatted = `${formatBytes(blockReadBytes)} / ${formatBytes(blockWriteBytes)}`;
+
+					// Create a stat object compatible with recordAdvancedStats
+					const stat = {
+						CPUPerc: `${cpuUsage.toFixed(2)}%`,
+						MemPerc: `${memUsedPercent.toFixed(2)}%`,
+						MemUsage: memUsageFormatted,
+						BlockIO: blockIOFormatted,
+						NetIO: netIOFormatted,
+						Container: "dokploy",
+						ID: "host-system",
+						Name: "dokploy",
+					};
+
+					await recordAdvancedStats(stat, appName);
+					const data = await getLastAdvancedStatsFile(appName);
+					console.log(data);
+
+					ws.send(
+						JSON.stringify({
+							data,
+						}),
+					);
+					return;
+				}
+
 				const filter = {
 					status: ["running"],
 					...(appType === "application" && {

packages/server/package.json

@@ -61,7 +61,7 @@
     "lodash": "4.17.21",
     "micromatch": "4.0.8",
     "nanoid": "3.3.11",
-    "node-os-utils": "1.3.7",
+    "node-os-utils": "2.0.1",
     "node-pty": "1.0.0",
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.14",
@@ -88,7 +88,6 @@
     "@types/lodash": "4.17.4",
     "@types/micromatch": "4.0.9",
     "@types/node": "^18.19.104",
-    "@types/node-os-utils": "1.3.4",
     "@types/node-schedule": "2.1.6",
     "@types/nodemailer": "^6.4.17",
     "@types/qrcode": "^1.5.5",

packages/server/src/monitoring/utils.ts

@@ -1,7 +1,6 @@
 import { promises } from "node:fs";
-import osUtils from "node-os-utils";
+import { OSUtils } from "node-os-utils";
 import { paths } from "../constants";
-
 export interface Container {
 	BlockIO: string;
 	CPUPerc: string;
@@ -38,19 +37,23 @@ export const recordAdvancedStats = async (
 	});
 
 	if (appName === "dokploy") {
-		const disk = await osUtils.drive.info("/");
+		const osutils = new OSUtils();
+		const diskResult = await osutils.disk.usageByMountPoint("/");
 
-		const diskUsage = disk.usedGb;
-		const diskTotal = disk.totalGb;
-		const diskUsedPercentage = disk.usedPercentage;
-		const diskFree = disk.freeGb;
+		if (diskResult.success && diskResult.data) {
+			const disk = diskResult.data;
+			const diskUsage = disk.used.toGB().toFixed(2);
+			const diskTotal = disk.total.toGB().toFixed(2);
+			const diskUsedPercentage = disk.usagePercentage;
+			const diskFree = disk.available.toGB().toFixed(2);
 
-		await updateStatsFile(appName, "disk", {
-			diskTotal: +diskTotal,
-			diskUsedPercentage: +diskUsedPercentage,
-			diskUsage: +diskUsage,
-			diskFree: +diskFree,
-		});
+			await updateStatsFile(appName, "disk", {
+				diskTotal: +diskTotal,
+				diskUsedPercentage: +diskUsedPercentage,
+				diskUsage: +diskUsage,
+				diskFree: +diskFree,
+			});
+		}
 	}
 };
 

packages/server/src/services/application.ts

@@ -419,6 +419,9 @@ export const deployPreviewApplication = async ({
 };
 
 export const getApplicationStats = async (appName: string) => {
+	if (appName === "dokploy") {
+		return await getAdvancedStats(appName);
+	}
 	const filter = {
 		status: ["running"],
 		label: [`com.docker.swarm.service.name=${appName}`],