Skip to content

fix: apply success filter #2815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chronark merged 1 commit into from
Jan 14, 2025
Merged

fix: apply success filter #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/dashboard/app/(app)/ratelimits/[namespaceId]/logs/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default async function AuditPage(props: Props) {
{namespace.name}
</Navbar.Breadcrumbs.Link>
<Navbar.Breadcrumbs.Link href={`/ratelimits/${props.params.namespaceId}/logs`} active>
Logs{" "}
Logs
</Navbar.Breadcrumbs.Link>
</Navbar.Breadcrumbs>
<Navbar.Actions>
Expand Down Expand Up @@ -150,7 +150,7 @@ const AuditLogTable: React.FC<{
country: selected.country.length > 0 ? selected.country : undefined,
ipAddress: selected.ipAddress.length > 0 ? selected.ipAddress : undefined,

success: selected.success ?? undefined,
passed: selected.success ?? undefined,
};
const logs = await clickhouse.ratelimits.logs(query).then((res) => res.val!);

Expand Down
39 changes: 19 additions & 20 deletions internal/clickhouse/src/ratelimits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,33 +168,32 @@ const getRatelimitLogsParameters = z.object({

export function getRatelimitLogs(ch: Querier) {
return async (args: z.input<typeof getRatelimitLogsParameters>) => {
const query = ch.query({
query: `
SELECT
request_id,
time,
identifier,
passed
FROM ratelimits.raw_ratelimits_v1
WHERE workspace_id = {workspaceId: String}
AND namespace_id = {namespaceId: String}
${args.identifier ? "AND multiSearchAny(identifier, {identifier: Array(String)}) > 0" : ""}
AND time >= {start: Int64}
AND time <= {end: Int64}
${typeof args.passed !== "undefined" ? "passed = {passed:Boolean}" : ""}
ORDER BY time DESC
LIMIT {limit: Int64}
;`,
const query = `
SELECT
request_id,
time,
identifier,
passed
FROM ratelimits.raw_ratelimits_v1
WHERE workspace_id = {workspaceId: String}
AND namespace_id = {namespaceId: String}
${args.identifier ? "AND multiSearchAny(identifier, {identifier: Array(String)}) > 0" : ""}
AND time >= {start: Int64}
AND time <= {end: Int64}
${typeof args.passed !== "undefined" ? "AND passed = {passed:Boolean}" : ""}
ORDER BY time DESC
LIMIT {limit: Int64}
;`;
return ch.query({
query: query,
params: getRatelimitLogsParameters,
schema: z.object({
request_id: z.string(),
time: z.number(),
identifier: z.string(),
passed: z.boolean(),
}),
});

return query(args);
})(args);
};
}
const getRatelimitLastUsedParameters = z.object({
Expand Down