diff --git a/apps/dokploy/__test__/requests/request.test.ts b/apps/dokploy/__test__/requests/request.test.ts index 53ca8d777..70852494d 100644 --- a/apps/dokploy/__test__/requests/request.test.ts +++ b/apps/dokploy/__test__/requests/request.test.ts @@ -54,4 +54,20 @@ describe("processLogs", () => { const result = parseRawConfig(entryWithWhitespace); expect(result.data).toHaveLength(2); }); + + it("should filter out Dokploy dashboard requests", () => { + const dokployDashboardEntry = `{"ClientAddr":"172.71.187.131:9485","ClientHost":"172.71.187.131","ClientPort":"9485","ClientUsername":"-","DownstreamContentSize":14550,"DownstreamStatus":200,"Duration":57681682,"OriginContentSize":14550,"OriginDuration":57612242,"OriginStatus":200,"Overhead":69440,"RequestAddr":"hostinger.dokploy.com","RequestContentSize":0,"RequestCount":20142,"RequestHost":"hostinger.dokploy.com","RequestMethod":"GET","RequestPath":"/_next/data/cb_zzI4Rp9G7Q7djrFKh0/en/dashboard/traefik.json","RequestPort":"-","RequestProtocol":"HTTP/2.0","RequestScheme":"https","RetryAttempts":0,"RouterName":"dokploy-router-app-secure@file","ServiceAddr":"dokploy:3000","ServiceName":"dokploy-service-app@file","ServiceURL":"http://dokploy:3000","StartLocal":"2025-12-10T05:10:41.957755949Z","StartUTC":"2025-12-10T05:10:41.957755949Z","TLSCipher":"TLS_AES_128_GCM_SHA256","TLSVersion":"1.3","entryPointName":"websecure","level":"info","msg":"","time":"2025-12-10T05:10:42Z"}`; + + // Test with only Dokploy dashboard entry - should be filtered out + const resultOnlyDokploy = parseRawConfig(dokployDashboardEntry); + expect(resultOnlyDokploy.data).toHaveLength(0); + expect(resultOnlyDokploy.totalCount).toBe(0); + + // Test with mixed entries - Dokploy should be filtered, others should remain + const mixedEntries = `${dokployDashboardEntry}\n${sampleLogEntry}`; + const resultMixed = parseRawConfig(mixedEntries); + expect(resultMixed.data).toHaveLength(1); + expect(resultMixed.totalCount).toBe(1); + expect(resultMixed.data[0]?.ServiceName).not.toBe("dokploy-service-app@file"); + }); }); diff --git a/packages/server/src/utils/access-log/utils.ts b/packages/server/src/utils/access-log/utils.ts index b9b4fd879..b89dc2ed2 100644 --- a/packages/server/src/utils/access-log/utils.ts +++ b/packages/server/src/utils/access-log/utils.ts @@ -27,10 +27,6 @@ export function processLogs( if (log.ServiceName === "dokploy-service-app@file") { return null; } - // Exclude Dashboard requests - they start with /dashboard - if (log.RequestPath?.startsWith("/dashboard")) { - return null; - } const date = new Date(log.StartUTC); if (dateRange?.start || dateRange?.end) { @@ -101,12 +97,13 @@ export function parseRawConfig( } }) .compact() - .filter((log) => { - // Exclude Dashboard requests - they start with /dashboard - return !log.RequestPath?.startsWith("/dashboard"); - }) .value(); + // Filter out Dokploy dashboard requests + parsedLogs = parsedLogs.filter( + (log) => log.ServiceName !== "dokploy-service-app@file", + ); + // Apply date range filter if provided if (dateRange?.start || dateRange?.end) { parsedLogs = parsedLogs.filter((log) => { diff --git a/packages/server/src/utils/traefik/application.ts b/packages/server/src/utils/traefik/application.ts index 80f7c1476..e3b86609f 100644 --- a/packages/server/src/utils/traefik/application.ts +++ b/packages/server/src/utils/traefik/application.ts @@ -163,10 +163,7 @@ export const readMonitoringConfig = async (readAll = false) => { ) { const log = JSON.parse(trimmed); // Exclude Dokploy service app and Dashboard requests - if ( - log.ServiceName !== "dokploy-service-app@file" && - !log.RequestPath?.startsWith("/dashboard") - ) { + if (log.ServiceName !== "dokploy-service-app@file") { content += `${line}\n`; validCount++; if (validCount >= 500) {