refactor: update path

Dokploy · Jan 1, 2025 · 7fd6436 · 7fd6436
1 parent 9dc10fa
commit 7fd6436
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 18 deletions.
diff --git a/apps/dokploy/components/dashboard/settings/servers/setup-monitoring.tsx b/apps/dokploy/components/dashboard/settings/servers/setup-monitoring.tsx
@@ -244,8 +244,8 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 															onValueChange={setSearch}
 														/>
 														<CommandEmpty>No service found.</CommandEmpty>
-														<CommandGroup>
-															<ScrollArea className="h-[200px]">
+														<CommandGroup className="max-h-[200px] overflow-hidden">
+															<ScrollArea className="h-[200px]" onWheel={(e) => e.stopPropagation()}>
 																{availableServices?.map((service) => (
 																	<CommandItem
 																		key={service}
@@ -332,8 +332,8 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 															onValueChange={setSearchExclude}
 														/>
 														<CommandEmpty>No service found.</CommandEmpty>
-														<CommandGroup>
-															<ScrollArea className="h-[200px]">
+														<CommandGroup className="max-h-[200px] overflow-hidden">
+															<ScrollArea className="h-[200px]" onWheel={(e) => e.stopPropagation()}>
 																{availableServicesToExclude.map((service) => (
 																	<CommandItem
 																		key={service}

diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts
@@ -238,14 +238,14 @@ export const serverRouter = createTRPCRouter({
 					containerRefreshRateMetrics: input.containerRefreshRateMetrics,
 					serverRefreshRateMetrics: input.serverRefreshRateMetrics,
 					containersMetricsDefinition: {
-						includeServices: input.containersMetricsDefinition.includeServices,
+						includeServices:
+							input?.containersMetricsDefinition?.includeServices ?? [],
 						excludedServices:
-							input.containersMetricsDefinition.excludedServices,
+							input?.containersMetricsDefinition?.excludedServices ?? [],
 					},
 				});
-				// const currentServer = await setupMonitoring(input.serverId);
-				// return currentServer;
-				return true;
+				const currentServer = await setupMonitoring(input.serverId);
+				return currentServer;
 			} catch (error) {
 				throw error;
 			}

diff --git a/apps/monitoring/src/constants.ts b/apps/monitoring/src/constants.ts
@@ -2,12 +2,12 @@ import path from "node:path";
 
 export const serverLogFile = path.join(
 	process.env.NODE_ENV === "production"
-		? "/etc"
+		? "/etc/dokploy/monitoring"
 		: "/Users/mauricio/Documents/Github/Personal/dokploy/apps/dokploy/.docker",
 	"server_metrics.log",
 );
 export const containerLogFile = path.join(
 	process.env.NODE_ENV === "production"
-		? "/etc"
+		? "/etc/dokploy/monitoring"
 		: "/Users/mauricio/Documents/Github/Personal/dokploy/apps/dokploy/.docker/monitoring",
 );
diff --git a/apps/monitoring/src/index.ts b/apps/monitoring/src/index.ts
@@ -25,6 +25,9 @@ app.use(
 	}),
 );
 
+logServerMetrics();
+logContainerMetrics();
+
 app.use("/*", cors());
 // app.use(
 // 	"/*",
@@ -100,6 +103,3 @@ serve({
 	fetch: app.fetch,
 	port,
 });
-
-logServerMetrics();
-logContainerMetrics();
diff --git a/apps/monitoring/src/monitoring/containers.ts b/apps/monitoring/src/monitoring/containers.ts
@@ -34,7 +34,7 @@ const DEFAULT_CONFIG: MonitoringConfig = {
 // Cargar la configuración desde la variable de entorno
 const loadConfig = (): MonitoringConfig => {
 	try {
-		const configJson = process.env.MONITORING_CONFIG;
+		const configJson = process.env.CONTAINER_MONITORING_CONFIG;
 
 		if (!configJson) {
 			return DEFAULT_CONFIG;
@@ -50,7 +50,7 @@ const loadConfig = (): MonitoringConfig => {
 
 const config = loadConfig();
 const REFRESH_RATE_CONTAINER = Number(
-	process.env.CONTAINER_REFRESH_RATE || 8000,
+	process.env.CONTAINER_REFRESH_RATE || 10000,
 );
 
 interface Container {

diff --git a/apps/monitoring/src/monitoring/server.ts b/apps/monitoring/src/monitoring/server.ts
@@ -46,7 +46,7 @@ const getServerMetrics = async () => {
 	};
 };
 
-const REFRESH_RATE_SERVER = Number(process.env.REFRESH_RATE_SERVER || 5000);
+const REFRESH_RATE_SERVER = Number(process.env.REFRESH_RATE_SERVER || 10000);
 const MAX_FILE_SIZE_MB = Number(process.env.MAX_FILE_SIZE_MB || 10); // 10 MB por defecto
 
 export const logServerMetrics = () => {

diff --git a/packages/server/src/setup/monitoring-setup.ts b/packages/server/src/setup/monitoring-setup.ts
@@ -12,7 +12,11 @@ export const setupMonitoring = async (serverId: string) => {
 	const settings: ContainerCreateOptions = {
 		name: containerName,
 		Env: [
-			`REFRESH_RATE_SERVER=${server.refreshRateMetrics * 1000}`,
+			`REFRESH_RATE_SERVER=${server.serverRefreshRateMetrics * 1000}`,
+			`CONTAINER_REFRESH_RATE=${server.containerRefreshRateMetrics * 1000}`,
+			`CONTAINER_MONITORING_CONFIG=${JSON.stringify(
+				server?.containersMetricsDefinition,
+			)}`,
 			`PORT=${server.defaultPortMetrics}`,
 		],
 		Image: imageName,
@@ -31,6 +35,7 @@ export const setupMonitoring = async (serverId: string) => {
 				"/var/run/docker.sock:/var/run/docker.sock:ro",
 				"/sys:/host/sys:ro",
 				"/etc/os-release:/etc/os-release:ro",
+				"/etc/dokploy/monitoring:/etc/dokploy/monitoring",
 				// "/proc/cpuinfo:/proc/cpuinfo:ro",
 				// "/proc/cpuinfo:/host/proc/cpuinfo:ro",
 			],