diff --git a/server/routers/integration.ts b/server/routers/integration.ts index 707db634..878d61fa 100644 --- a/server/routers/integration.ts +++ b/server/routers/integration.ts @@ -871,3 +871,17 @@ authenticated.get( logActionAudit(ActionsEnum.exportLogs), logs.exportRequestAuditLogs ); + +authenticated.get( + "/org/:orgId/logs/analytics", + verifyApiKeyOrgAccess, + verifyApiKeyHasAction(ActionsEnum.viewLogs), + logs.queryRequestAnalytics +); + +authenticated.get( + "/org/:orgId/resource-names", + verifyApiKeyOrgAccess, + verifyApiKeyHasAction(ActionsEnum.listResources), + resource.listAllResourceNames +); diff --git a/server/routers/resource/listAllResourceNames.ts b/server/routers/resource/listAllResourceNames.ts index 80b21fd4..df78e264 100644 --- a/server/routers/resource/listAllResourceNames.ts +++ b/server/routers/resource/listAllResourceNames.ts @@ -1,26 +1,14 @@ import { Request, Response, NextFunction } from "express"; import { z } from "zod"; -import { db, resourceHeaderAuth } from "@server/db"; -import { - resources, - userResources, - roleResources, - resourcePassword, - resourcePincode, - targets, - targetHealthCheck -} from "@server/db"; +import { db } from "@server/db"; +import { resources } from "@server/db"; import response from "@server/lib/response"; import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors"; -import { sql, eq, or, inArray, and, count } from "drizzle-orm"; +import { eq } from "drizzle-orm"; import logger from "@server/logger"; import { fromZodError } from "zod-validation-error"; import { OpenAPITags, registry } from "@server/openApi"; -import type { - ResourceWithTargets, - ListResourcesResponse -} from "./listResources"; const listResourcesParamsSchema = z.strictObject({ orgId: z.string() diff --git a/src/components/LogAnalyticsData.tsx b/src/components/LogAnalyticsData.tsx index aeeaa0ef..2fd30189 100644 --- a/src/components/LogAnalyticsData.tsx +++ b/src/components/LogAnalyticsData.tsx @@ -139,9 +139,6 @@ export function LogAnalyticsData(props: AnalyticsContentProps) { } } - console.log({ - endDate - }); newSearch.set("timeEnd", endDate.toISOString()); } router.replace(`${path}?${newSearch.toString()}`);