add after to docker logs query
This commit is contained in:
1 parent
37e1005479
commit
6e0afe223e
7 files changed
+60
-11
No files matched your search
@@ -205,7 +205,7 @@ class MonitorController implements IMonitorController {
|
||||
const validatedQuery = getDockerContainerLogsQueryValidation.parse(req.query);
|
||||
|
||||
const { monitorId, containerName } = validatedParams;
|
||||
const { before, limit } = validatedQuery;
|
||||
const { before, after, limit } = validatedQuery;
|
||||
const teamId = requireTeamId(req.user?.teamId);
|
||||
|
||||
const data = await this.monitorService.getDockerContainerLogs({
|
||||
@@ -213,6 +213,7 @@ class MonitorController implements IMonitorController {
|
||||
monitorId,
|
||||
containerName,
|
||||
before: before ? new Date(before) : undefined,
|
||||
after: after ? new Date(after) : undefined,
|
||||
limit,
|
||||
});
|
||||
|
||||
|
||||
@@ -333,11 +333,21 @@ export const getDockerContainerNameParamValidation = z.object({
|
||||
});
|
||||
export const getDockerContainerByNameQueryValidation = z.object({ dateRange: z.enum(DateRanges).optional() });
|
||||
|
||||
export const getDockerContainerLogsQueryValidation = z.object({
|
||||
before: z.iso.datetime().optional(),
|
||||
limit: z.coerce.number().int().min(1).max(DOCKER_LOG_PAGE_MAX).default(DOCKER_LOG_PAGE_DEFAULT),
|
||||
});
|
||||
|
||||
export const getDockerContainerLogsQueryValidation = z
|
||||
.object({
|
||||
before: z.iso.datetime().optional(),
|
||||
after: z.iso.datetime().optional(),
|
||||
limit: z.coerce.number().int().min(1).max(DOCKER_LOG_PAGE_MAX).default(DOCKER_LOG_PAGE_DEFAULT),
|
||||
})
|
||||
.superRefine((query, ctx) => {
|
||||
if (query.before && query.after) {
|
||||
ctx.addIssue({
|
||||
code: "custom",
|
||||
message: "Specify either before or after, not both",
|
||||
path: ["after"],
|
||||
});
|
||||
}
|
||||
});
|
||||
// Canonical monitor shape returned by /monitors endpoints. Keep aligned with
|
||||
// what the controllers actually serialize.
|
||||
export const monitorResponseSchema = z
|
||||
|
||||
Reference in new issue
Block a user