Skip to content

Commit daba2d7

Browse files
committed
feat: add Docker events tab to docker dashboard
Adds a new Events tab to /dashboard/docker showing Docker daemon events (equivalent to `docker events`), polled via docker.getEvents with a time-range selector and refresh button. Also fixes a stale isCloud redirect that forced the Networks tab back to Containers even though it is now shown in cloud.
1 parent a60b0af commit daba2d7

4 files changed

Lines changed: 327 additions & 10 deletions

File tree

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,245 @@
1+
import { Activity, Loader2, RefreshCw } from "lucide-react";
2+
import { useMemo, useState } from "react";
3+
import { Badge } from "@/components/ui/badge";
4+
import { Button } from "@/components/ui/button";
5+
import {
6+
Card,
7+
CardContent,
8+
CardDescription,
9+
CardHeader,
10+
CardTitle,
11+
} from "@/components/ui/card";
12+
import { Input } from "@/components/ui/input";
13+
import {
14+
Select,
15+
SelectContent,
16+
SelectItem,
17+
SelectTrigger,
18+
SelectValue,
19+
} from "@/components/ui/select";
20+
import {
21+
Table,
22+
TableBody,
23+
TableCell,
24+
TableHead,
25+
TableHeader,
26+
TableRow,
27+
} from "@/components/ui/table";
28+
import { api, type RouterOutputs } from "@/utils/api";
29+
30+
interface Props {
31+
serverId?: string;
32+
}
33+
34+
type DockerEvent = RouterOutputs["docker"]["getEvents"]["events"][number];
35+
36+
const RANGE_OPTIONS = [
37+
{ label: "Last 5 minutes", value: 5 },
38+
{ label: "Last 15 minutes", value: 15 },
39+
{ label: "Last hour", value: 60 },
40+
{ label: "Last 6 hours", value: 360 },
41+
{ label: "Last 24 hours", value: 1440 },
42+
];
43+
44+
type BadgeVariant = "blue" | "green" | "yellow" | "orange" | "red" | "blank";
45+
46+
const TYPE_VARIANTS: Record<string, BadgeVariant> = {
47+
container: "blue",
48+
image: "green",
49+
volume: "yellow",
50+
network: "orange",
51+
service: "blue",
52+
node: "orange",
53+
};
54+
55+
const ACTION_VARIANTS: Record<string, BadgeVariant> = {
56+
create: "green",
57+
start: "green",
58+
pull: "green",
59+
connect: "green",
60+
die: "red",
61+
destroy: "red",
62+
kill: "red",
63+
stop: "red",
64+
remove: "red",
65+
disconnect: "red",
66+
pause: "yellow",
67+
unpause: "yellow",
68+
};
69+
70+
const getTypeVariant = (type?: string): BadgeVariant =>
71+
(type && TYPE_VARIANTS[type]) || "blank";
72+
73+
const getActionVariant = (action?: string): BadgeVariant =>
74+
(action && ACTION_VARIANTS[action]) || "blank";
75+
76+
export const ShowDockerEvents = ({ serverId }: Props) => {
77+
const [minutes, setMinutes] = useState(15);
78+
const [search, setSearch] = useState("");
79+
80+
const { data, isLoading, isRefetching, refetch, error } =
81+
api.docker.getEvents.useQuery({
82+
serverId,
83+
minutes,
84+
});
85+
86+
const events = data?.events ?? [];
87+
88+
const filteredEvents = useMemo(() => {
89+
if (!search.trim()) return events;
90+
const query = search.toLowerCase();
91+
return events.filter((event) => {
92+
return (
93+
event.Type?.toLowerCase().includes(query) ||
94+
event.Action?.toLowerCase().includes(query) ||
95+
event.Actor?.Attributes?.name?.toLowerCase().includes(query) ||
96+
event.Actor?.ID?.toLowerCase().includes(query)
97+
);
98+
});
99+
}, [events, search]);
100+
101+
return (
102+
<div className="w-full">
103+
<Card className="h-full bg-sidebar p-2.5 rounded-xl">
104+
<div className="rounded-xl bg-background shadow-md">
105+
<CardHeader>
106+
<div className="flex flex-wrap items-center justify-between gap-2">
107+
<div>
108+
<CardTitle className="text-xl flex flex-row gap-2">
109+
<Activity className="size-6 text-muted-foreground self-center" />
110+
Docker Events
111+
</CardTitle>
112+
<CardDescription>
113+
Events reported by the Docker daemon, equivalent to running
114+
"docker events".
115+
</CardDescription>
116+
</div>
117+
<Button
118+
variant="outline"
119+
size="sm"
120+
onClick={() => refetch()}
121+
disabled={isRefetching}
122+
>
123+
<RefreshCw
124+
className={`size-4 mr-1 ${isRefetching ? "animate-spin" : ""}`}
125+
/>
126+
Refresh
127+
</Button>
128+
</div>
129+
</CardHeader>
130+
<CardContent className="space-y-4 py-8 border-t">
131+
{error && (
132+
<p className="text-sm text-destructive">{error.message}</p>
133+
)}
134+
<div className="flex flex-wrap items-center gap-2">
135+
<Input
136+
placeholder="Filter by type, action or name..."
137+
value={search}
138+
onChange={(e) => setSearch(e.target.value)}
139+
className="max-w-xs"
140+
/>
141+
<Select
142+
value={String(minutes)}
143+
onValueChange={(value) => setMinutes(Number(value))}
144+
>
145+
<SelectTrigger className="w-[180px]">
146+
<SelectValue />
147+
</SelectTrigger>
148+
<SelectContent>
149+
{RANGE_OPTIONS.map((option) => (
150+
<SelectItem key={option.value} value={String(option.value)}>
151+
{option.label}
152+
</SelectItem>
153+
))}
154+
</SelectContent>
155+
</Select>
156+
</div>
157+
<div className="rounded-md border overflow-x-auto">
158+
<Table>
159+
<TableHeader>
160+
<TableRow>
161+
<TableHead className="w-[110px]">Time</TableHead>
162+
<TableHead className="w-[100px]">Type</TableHead>
163+
<TableHead className="w-[110px]">Action</TableHead>
164+
<TableHead>Resource</TableHead>
165+
<TableHead>Attributes</TableHead>
166+
</TableRow>
167+
</TableHeader>
168+
<TableBody>
169+
{isLoading ? (
170+
<TableRow>
171+
<TableCell
172+
colSpan={5}
173+
className="h-24 text-center text-muted-foreground"
174+
>
175+
<div className="flex flex-row items-center justify-center gap-2">
176+
<span>Loading events...</span>
177+
<Loader2 className="size-4 animate-spin" />
178+
</div>
179+
</TableCell>
180+
</TableRow>
181+
) : filteredEvents.length ? (
182+
filteredEvents.map((event: DockerEvent, index: number) => {
183+
const attributes = Object.entries(
184+
event.Actor?.Attributes ?? {},
185+
).filter(([key]) => key !== "name");
186+
const attributesText =
187+
attributes
188+
.map(([key, value]) => `${key}=${value}`)
189+
.join(" ") || "-";
190+
const resource =
191+
event.Actor?.Attributes?.name ?? event.Actor?.ID ?? "-";
192+
193+
return (
194+
<TableRow
195+
key={`${event.time}-${event.Action}-${index}`}
196+
>
197+
<TableCell className="text-xs text-muted-foreground whitespace-nowrap">
198+
{event.time
199+
? new Date(event.time * 1000).toLocaleTimeString()
200+
: "-"}
201+
</TableCell>
202+
<TableCell>
203+
<Badge variant={getTypeVariant(event.Type)}>
204+
{event.Type ?? "unknown"}
205+
</Badge>
206+
</TableCell>
207+
<TableCell>
208+
<Badge variant={getActionVariant(event.Action)}>
209+
{event.Action ?? "-"}
210+
</Badge>
211+
</TableCell>
212+
<TableCell
213+
className="max-w-[220px] truncate font-mono text-xs"
214+
title={resource}
215+
>
216+
{resource}
217+
</TableCell>
218+
<TableCell
219+
className="max-w-[360px] truncate text-xs text-muted-foreground"
220+
title={attributesText}
221+
>
222+
{attributesText}
223+
</TableCell>
224+
</TableRow>
225+
);
226+
})
227+
) : (
228+
<TableRow>
229+
<TableCell
230+
colSpan={5}
231+
className="h-24 text-center text-muted-foreground"
232+
>
233+
No events found in the selected time range.
234+
</TableCell>
235+
</TableRow>
236+
)}
237+
</TableBody>
238+
</Table>
239+
</div>
240+
</CardContent>
241+
</div>
242+
</Card>
243+
</div>
244+
);
245+
};

‎apps/dokploy/pages/dashboard/docker.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { GetServerSidePropsContext } from "next";
44
import { useRouter } from "next/router";
55
import type { ReactElement } from "react";
66
import superjson from "superjson";
7+
import { ShowDockerEvents } from "@/components/dashboard/docker/events/show-docker-events";
78
import { ShowContainers } from "@/components/dashboard/docker/show/show-containers";
89
import { ShowVolumes } from "@/components/dashboard/docker/volumes/show-volumes";
910
import { ShowNetworks } from "@/components/dashboard/networks/show-networks";
@@ -15,18 +16,15 @@ import { ServerFilter } from "@/components/shared/server-filter";
1516
import { Card } from "@/components/ui/card";
1617
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
1718
import { appRouter } from "@/server/api/root";
18-
import { api } from "@/utils/api";
1919

2020
const DEFAULT_TAB = "containers";
2121
const DEFAULT_SWARM_TAB = "overview";
2222

2323
const Dashboard = () => {
2424
const router = useRouter();
25-
const { data: isCloud } = api.settings.isCloud.useQuery();
2625

27-
const queryTab =
26+
const activeTab =
2827
typeof router.query.tab === "string" ? router.query.tab : DEFAULT_TAB;
29-
const activeTab = isCloud && queryTab === "networks" ? DEFAULT_TAB : queryTab;
3028

3129
const activeSwarmTab =
3230
typeof router.query.subtab === "string"
@@ -66,7 +64,8 @@ const Dashboard = () => {
6664
<TabsTrigger value="containers">Containers</TabsTrigger>
6765
<TabsTrigger value="swarm">Swarm</TabsTrigger>
6866
<TabsTrigger value="volumes">Volumes</TabsTrigger>
69-
{!isCloud && <TabsTrigger value="networks">Networks</TabsTrigger>}
67+
<TabsTrigger value="networks">Networks</TabsTrigger>
68+
<TabsTrigger value="events">Events</TabsTrigger>
7069
</TabsList>
7170
<TabsContent value="containers">
7271
<ShowContainers serverId={serverId} />
@@ -96,11 +95,12 @@ const Dashboard = () => {
9695
<TabsContent value="volumes">
9796
<ShowVolumes serverId={serverId} />
9897
</TabsContent>
99-
{!isCloud && (
100-
<TabsContent value="networks">
101-
<ShowNetworks serverId={serverId} />
102-
</TabsContent>
103-
)}
98+
<TabsContent value="networks">
99+
<ShowNetworks serverId={serverId} />
100+
</TabsContent>
101+
<TabsContent value="events">
102+
<ShowDockerEvents serverId={serverId} />
103+
</TabsContent>
104104
</Tabs>
105105
)}
106106
</ServerFilter>

‎apps/dokploy/server/api/routers/docker.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
getContainers,
1111
getContainersByAppLabel,
1212
getContainersByAppNameMatch,
13+
getDockerEvents,
1314
getServiceContainersByAppName,
1415
getStackContainersByAppName,
1516
listContainerFiles,
@@ -424,4 +425,21 @@ export const dockerRouter = createTRPCRouter({
424425
resourceName: `${input.containerId}:${input.path}`,
425426
});
426427
}),
428+
429+
getEvents: withPermission("docker", "read")
430+
.input(
431+
z.object({
432+
serverId: z.string().optional(),
433+
minutes: z.number().min(1).max(1440).default(15),
434+
}),
435+
)
436+
.query(async ({ input, ctx }) => {
437+
if (input.serverId) {
438+
const server = await findServerById(input.serverId);
439+
if (server.organizationId !== ctx.session?.activeOrganizationId) {
440+
throw new TRPCError({ code: "UNAUTHORIZED" });
441+
}
442+
}
443+
return await getDockerEvents(input.serverId, input.minutes);
444+
}),
427445
});

‎packages/server/src/services/docker.ts‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,3 +871,57 @@ export const deleteContainerFile = async (
871871
throw error;
872872
}
873873
};
874+
875+
export interface DockerEvent {
876+
Type?: string;
877+
Action?: string;
878+
Actor?: {
879+
ID?: string;
880+
Attributes?: Record<string, string>;
881+
};
882+
time?: number;
883+
}
884+
885+
export const getDockerEvents = async (
886+
serverId?: string | null,
887+
minutes = 15,
888+
) => {
889+
const until = new Date();
890+
const since = new Date(until.getTime() - minutes * 60 * 1000);
891+
const command = `docker events --since ${quote([since.toISOString()])} --until ${quote([until.toISOString()])} --format '{{json .}}'`;
892+
893+
let stdout = "";
894+
let stderr = "";
895+
if (serverId) {
896+
const result = await execAsyncRemote(serverId, command);
897+
stdout = result.stdout;
898+
stderr = result.stderr;
899+
} else {
900+
const result = await execAsync(command);
901+
stdout = result.stdout;
902+
stderr = result.stderr;
903+
}
904+
905+
if (stderr) {
906+
console.error(`Error: ${stderr}`);
907+
}
908+
909+
const events: DockerEvent[] = stdout
910+
.trim()
911+
.split("\n")
912+
.filter(Boolean)
913+
.map((line) => {
914+
try {
915+
return JSON.parse(line) as DockerEvent;
916+
} catch {
917+
return null;
918+
}
919+
})
920+
.filter((event): event is DockerEvent => event !== null)
921+
.reverse();
922+
923+
return {
924+
events,
925+
fetchedAt: until.toISOString(),
926+
};
927+
};

0 commit comments

Comments
 (0)