diff --git a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/logs/page.tsx b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/logs/page.tsx index 277f26d626..775dd41edc 100644 --- a/apps/dashboard/app/(app)/ratelimits/[namespaceId]/logs/page.tsx +++ b/apps/dashboard/app/(app)/ratelimits/[namespaceId]/logs/page.tsx @@ -81,7 +81,7 @@ export default async function AuditPage(props: Props) { {namespace.name} - Logs{" "} + Logs @@ -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!); diff --git a/internal/clickhouse/src/ratelimits.ts b/internal/clickhouse/src/ratelimits.ts index 78649b8777..cda5f4fb10 100644 --- a/internal/clickhouse/src/ratelimits.ts +++ b/internal/clickhouse/src/ratelimits.ts @@ -168,23 +168,24 @@ const getRatelimitLogsParameters = z.object({ export function getRatelimitLogs(ch: Querier) { return async (args: z.input) => { - 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(), @@ -192,9 +193,7 @@ export function getRatelimitLogs(ch: Querier) { identifier: z.string(), passed: z.boolean(), }), - }); - - return query(args); + })(args); }; } const getRatelimitLastUsedParameters = z.object({