diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx index 955d0135b..a17251e35 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx @@ -7,7 +7,7 @@ import { ShowExternalMariadbCredentials } from "@/components/dashboard/mariadb/g import { ShowGeneralMariadb } from "@/components/dashboard/mariadb/general/show-general-mariadb"; import { ShowInternalMariadbCredentials } from "@/components/dashboard/mariadb/general/show-internal-mariadb-credentials"; import { UpdateMariadb } from "@/components/dashboard/mariadb/update-mariadb"; -import { DockerMonitoring } from "@/components/dashboard/monitoring/docker/show"; +import { ContainerMonitoring } from "@/components/dashboard/monitoring/container/show"; import { MariadbIcon } from "@/components/icons/data-tools-icons"; import { ProjectLayout } from "@/components/layouts/project-layout"; import { StatusTooltip } from "@/components/shared/status-tooltip"; @@ -214,7 +214,10 @@ const Mariadb = ( {!data?.serverId && (
- +
)} diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx index 73ff2d0aa..a36bdcf99 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx @@ -7,7 +7,7 @@ import { ShowExternalMongoCredentials } from "@/components/dashboard/mongo/gener import { ShowGeneralMongo } from "@/components/dashboard/mongo/general/show-general-mongo"; import { ShowInternalMongoCredentials } from "@/components/dashboard/mongo/general/show-internal-mongo-credentials"; import { UpdateMongo } from "@/components/dashboard/mongo/update-mongo"; -import { DockerMonitoring } from "@/components/dashboard/monitoring/docker/show"; +import { ContainerMonitoring } from "@/components/dashboard/monitoring/container/show"; import { MongodbIcon } from "@/components/icons/data-tools-icons"; import { ProjectLayout } from "@/components/layouts/project-layout"; import { StatusTooltip } from "@/components/shared/status-tooltip"; @@ -216,7 +216,11 @@ const Mongo = ( {!data?.serverId && (
- + + {/* */}
)} diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx index 4e492eac3..18e0cbe23 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx @@ -1,5 +1,5 @@ import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; -import { DockerMonitoring } from "@/components/dashboard/monitoring/docker/show"; +import { ContainerMonitoring } from "@/components/dashboard/monitoring/container/show"; import { ShowAdvancedMysql } from "@/components/dashboard/mysql/advanced/show-mysql-advanced-settings"; import { ShowBackupMySql } from "@/components/dashboard/mysql/backups/show-backup-mysql"; import { DeleteMysql } from "@/components/dashboard/mysql/delete-mysql"; @@ -215,7 +215,11 @@ const MySql = ( {!data?.serverId && (
- + + {/* */}
)} diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx index dfbab6522..9361912a4 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx @@ -1,5 +1,5 @@ import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; -import { DockerMonitoring } from "@/components/dashboard/monitoring/docker/show"; +import { ContainerMonitoring } from "@/components/dashboard/monitoring/container/show"; import { ShowAdvancedPostgres } from "@/components/dashboard/postgres/advanced/show-postgres-advanced-settings"; import { ShowBackupPostgres } from "@/components/dashboard/postgres/backups/show-backup-postgres"; import { DeletePostgres } from "@/components/dashboard/postgres/delete-postgres"; @@ -216,7 +216,10 @@ const Postgresql = ( {!data?.serverId && (
- +
)} diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx index bac6e217d..7a4b72810 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx @@ -1,5 +1,5 @@ import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; -import { DockerMonitoring } from "@/components/dashboard/monitoring/docker/show"; +import { ContainerMonitoring } from "@/components/dashboard/monitoring/container/show"; import { ShowAdvancedRedis } from "@/components/dashboard/redis/advanced/show-redis-advanced-settings"; import { DeleteRedis } from "@/components/dashboard/redis/delete-redis"; import { ShowRedisEnvironment } from "@/components/dashboard/redis/environment/show-redis-environment"; @@ -214,7 +214,11 @@ const Redis = ( {!data?.serverId && (
- + + {/* */}
)} diff --git a/apps/monitoring/src/index.ts b/apps/monitoring/src/index.ts index 215189695..46d4edef1 100644 --- a/apps/monitoring/src/index.ts +++ b/apps/monitoring/src/index.ts @@ -6,7 +6,7 @@ import { config } from "dotenv"; import { serverLogFile, containerLogFile } from "./constants.js"; import { processMetricsFromFile } from "./utils.js"; import { logContainerMetrics } from "./monitoring/containers.js"; -import { existsSync } from "fs"; +import { existsSync } from "node:fs"; config(); const TOKEN = process.env.TOKEN || "default-token"; diff --git a/apps/monitoring/src/utils.ts b/apps/monitoring/src/utils.ts index ebf0414b9..2f16bceb9 100644 --- a/apps/monitoring/src/utils.ts +++ b/apps/monitoring/src/utils.ts @@ -20,8 +20,8 @@ export function parseLog(logContent: string) { try { return JSON.parse(line); } catch (error) { - console.error(`Error parsing log line: ${error}`); - console.error(`Problematic line: ${line}`); + // console.error(`Error parsing log line: ${error}`); + // console.error(`Problematic line: ${line}`); return null; } }) @@ -90,7 +90,7 @@ async function readLastNLines(filePath: string, limit: number) { buffer, length: chunkSize, position: size - chunkSize, - offset: 0 + offset: 0, }); const content = Buffer.from(buffer).toString("utf8"); const lines = content.split("\n").filter((line) => line.trim()); @@ -101,8 +101,8 @@ async function readLastNLines(filePath: string, limit: number) { try { return JSON.parse(line); } catch (error) { - console.error(`Error parsing log line: ${error}`); - console.error(`Problematic line: ${line}`); + // console.error(`Error parsing log line: ${error}`); + // console.error(`Problematic line: ${line}`); return null; } })