The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add app monitoring query for instance admins (#28293)
martmull6caaf26f8ad9
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 98fd6da2b98..d920a43a11b 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -53,6 +53,25 @@ export type AdminAiModels = {models: Array<AdminAiModelConfig>;};+export type AdminApplicationMonitoring = {+ __typename?: 'AdminApplicationMonitoring';+ activeWorkspaceCount: Scalars['Int']['output'];+ activity: Array<ApplicationMonitoringActivityBucket>;+ bucketSizeInSeconds: Scalars['Int']['output'];+ failedRunCount: Scalars['Int']['output'];+ functions: Array<ApplicationMonitoringFunction>;+ issues: Array<ApplicationMonitoringIssue>;+ lifecycle: Array<ApplicationMonitoringLifecycleBucket>;+ lifecycleFailureCount: Scalars['Int']['output'];+ lookbackInHours: Scalars['Int']['output'];+ periodEnd: Scalars['DateTime']['output'];+ periodStart: Scalars['DateTime']['output'];+ rateLimitEventCount: Scalars['Int']['output'];+ runCount: Scalars['Int']['output'];+ versions: Array<ApplicationMonitoringVersion>;+ workspaces: Array<ApplicationMonitoringWorkspace>;+};+export type AdminApplicationRegistrationClaim = {__typename?: 'AdminApplicationRegistrationClaim';workspaceDisplayName?: Maybe<Scalars['String']['output']>;@@ -272,6 +291,63 @@ export enum AiModelTier {smart = 'smart'}+export type ApplicationMonitoringActivityBucket = {+ __typename?: 'ApplicationMonitoringActivityBucket';+ bucketStart: Scalars['DateTime']['output'];+ errorCount: Scalars['Int']['output'];+ infoCount: Scalars['Int']['output'];+ warningCount: Scalars['Int']['output'];+};++export type ApplicationMonitoringFunction = {+ __typename?: 'ApplicationMonitoringFunction';+ failedRunCount: Scalars['Int']['output'];+ logicFunctionName: Scalars['String']['output'];+ p95DurationMs: Scalars['Float']['output'];+ runCount: Scalars['Int']['output'];+};++export type ApplicationMonitoringIssue = {+ __typename?: 'ApplicationMonitoringIssue';+ affectedInstallCount: Scalars['Int']['output'];+ errorCode: Scalars['String']['output'];+ eventCount: Scalars['Int']['output'];+ lastSeenAt: Scalars['DateTime']['output'];+ level: Scalars['String']['output'];+ logicFunctionName: Scalars['String']['output'];+ source: Scalars['String']['output'];+ versions: Array<Scalars['String']['output']>;+};++export type ApplicationMonitoringLifecycleBucket = {+ __typename?: 'ApplicationMonitoringLifecycleBucket';+ bucketStart: Scalars['DateTime']['output'];+ failedCount: Scalars['Int']['output'];+ installCount: Scalars['Int']['output'];+ uninstallCount: Scalars['Int']['output'];+ upgradeCount: Scalars['Int']['output'];+};++export type ApplicationMonitoringVersion = {+ __typename?: 'ApplicationMonitoringVersion';+ activeInstallCount: Scalars['Int']['output'];+ failedRunCount: Scalars['Int']['output'];+ runCount: Scalars['Int']['output'];+ version: Scalars['String']['output'];+};++export type ApplicationMonitoringWorkspace = {+ __typename?: 'ApplicationMonitoringWorkspace';+ applicationVersion: Scalars['String']['output'];+ failedRunCount: Scalars['Int']['output'];+ lastEventAt: Scalars['DateTime']['output'];+ rateLimitEventCount: Scalars['Int']['output'];+ runCount: Scalars['Int']['output'];+ workspaceId: Scalars['String']['output'];+ workspaceLogoUrl?: Maybe<Scalars['String']['output']>;+ workspaceName?: Maybe<Scalars['String']['output']>;+};+export type ApplicationRegistration = {__typename?: 'ApplicationRegistration';author?: Maybe<Scalars['String']['output']>;@@ -770,6 +846,7 @@ export type Query = {adminPanelTopWorkspaces: Array<AdminPanelTopWorkspace>;findAdminApplicationRegistrationClaims: Array<AdminApplicationRegistrationClaim>;findAdminApplicationRegistrationInstalledWorkspaces: ApplicationRegistrationInstalledWorkspaces;+ findAdminApplicationRegistrationMonitoring: AdminApplicationMonitoring;findAdminApplicationRegistrationStats: ApplicationRegistrationStats;findAdminApplicationRegistrationVariables: Array<ApplicationRegistrationVariable>;findAllApplicationRegistrations: PaginatedApplicationRegistrations;@@ -822,6 +899,14 @@ export type QueryFindAdminApplicationRegistrationInstalledWorkspacesArgs = {};+export type QueryFindAdminApplicationRegistrationMonitoringArgs = {+ id: Scalars['String']['input'];+ periodEnd?: InputMaybe<Scalars['DateTime']['input']>;+ periodStart?: InputMaybe<Scalars['DateTime']['input']>;+ workspaceId?: InputMaybe<Scalars['String']['input']>;+};++export type QueryFindAdminApplicationRegistrationStatsArgs = {id: Scalars['String']['input'];periodEnd?: InputMaybe<Scalars['DateTime']['input']>;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/admin-application-monitoring.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/admin-application-monitoring.resolver.tsnew file mode 100644index 00000000000..f76d4314abc--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/admin-application-monitoring.resolver.ts@@ -0,0 +1,67 @@+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';+import { Args, Query } from '@nestjs/graphql';++import { FeatureFlagKey } from 'twenty-shared/types';++import { AdminResolver } from 'src/engine/api/graphql/graphql-config/decorators/admin-resolver.decorator';+import { ApplicationMonitoringService } from 'src/engine/core-modules/application/application-monitoring/application-monitoring.service';+import { AdminApplicationMonitoringDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';+import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';++@UsePipes(ResolverValidationPipe)+@AdminResolver()+@UseFilters(+ AuthGraphqlApiExceptionFilter,+ PreventNestToAutoLogGraphqlErrorsFilter,+)+@UseGuards(+ AuthPrincipalGuard({+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: false,+ application: false,+ }),+ NoPermissionGuard,+)+export class AdminApplicationMonitoringResolver {+ constructor(+ private readonly applicationMonitoringService: ApplicationMonitoringService,+ ) {}++ @UseGuards(+ AdminPanelGuard,+ FeatureFlagGuard(FeatureFlagKey.IS_APPLICATION_MONITORING_ENABLED),+ )+ @Query(() => AdminApplicationMonitoringDTO)+ async findAdminApplicationRegistrationMonitoring(+ @Args('id') applicationRegistrationId: string,+ @AuthWorkspace() { id: viewerWorkspaceId }: WorkspaceEntity,+ @Args('workspaceId', { type: () => String, nullable: true })+ workspaceId?: string,+ @Args('periodStart', { type: () => Date, nullable: true })+ periodStart?: Date,+ @Args('periodEnd', { type: () => Date, nullable: true })+ periodEnd?: Date,+ ): Promise<AdminApplicationMonitoringDTO> {+ return this.applicationMonitoringService.getAdminMonitoring({+ applicationRegistrationId,+ viewerWorkspaceId,+ workspaceId,+ periodStart,+ periodEnd,+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.module.tsindex dc3f4d93165..e8c18ba1ecd 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.module.ts@@ -1,26 +1,36 @@import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';import { ClickHouseModule } from 'src/database/clickhouse/clickhouse.module';+import { AdminApplicationMonitoringResolver } from 'src/engine/core-modules/application/application-monitoring/admin-application-monitoring.resolver';import { ApplicationLookupModule } from 'src/engine/core-modules/application/application-lookup/application-lookup.module';import { ApplicationMonitoringResolver } from 'src/engine/core-modules/application/application-monitoring/application-monitoring.resolver';import { ApplicationMonitoringService } from 'src/engine/core-modules/application/application-monitoring/application-monitoring.service';import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';import { EventLogRetentionModule } from 'src/engine/core-modules/event-logs/retention/event-log-retention.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { FileUrlModule } from 'src/engine/core-modules/file/file-url/file-url.module';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [+ TypeOrmModule.forFeature([WorkspaceEntity]),ApplicationLookupModule,ApplicationRegistrationLookupModule,ClickHouseModule,EventLogRetentionModule,FeatureFlagModule,+ FileUrlModule,PermissionsModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,],- providers: [ApplicationMonitoringService, ApplicationMonitoringResolver],+ providers: [+ ApplicationMonitoringService,+ ApplicationMonitoringResolver,+ AdminApplicationMonitoringResolver,+ ],exports: [ApplicationMonitoringService],})export class ApplicationMonitoringModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.service.tsindex fd84ba48946..e78e16904d0 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/application-monitoring.service.ts@@ -1,40 +1,128 @@import { Injectable } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';++import { In, Repository } from 'typeorm';import { ClickHouseService } from 'src/database/clickhouse/clickhouse.service';import { formatDateTimeForClickHouse } from 'src/database/clickhouse/utils/format-date-time-for-clickhouse.util';import { APPLICATION_MONITORING_QUERIES } from 'src/engine/core-modules/application/application-monitoring/constants/application-monitoring-queries.constant';+import { type AdminApplicationMonitoringDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto';import { type ApplicationMonitoringDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/application-monitoring.dto';import {+ type ApplicationMonitoringActiveWorkspaceCountRow,type ApplicationMonitoringActivityRow,type ApplicationMonitoringFunctionRow,type ApplicationMonitoringIssueRow,type ApplicationMonitoringLifecycleRow,type ApplicationMonitoringTotalsRow,type ApplicationMonitoringVersionRow,+ type ApplicationMonitoringWorkspaceRow,} from 'src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type';import { getApplicationMonitoringLookbackInHours } from 'src/engine/core-modules/application/application-monitoring/utils/get-application-monitoring-lookback-in-hours.util';import { mapApplicationMonitoringRows } from 'src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-rows.util';-import { resolveApplicationMonitoringPeriod } from 'src/engine/core-modules/application/application-monitoring/utils/resolve-application-monitoring-period.util';+import { mapApplicationMonitoringWorkspaceRows } from 'src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-workspace-rows.util';+import {+ type ApplicationMonitoringPeriod,+ resolveApplicationMonitoringPeriod,+} from 'src/engine/core-modules/application/application-monitoring/utils/resolve-application-monitoring-period.util';import { EventLogRetentionService } from 'src/engine/core-modules/event-logs/retention/services/event-log-retention.service';+import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';++type ApplicationMonitoringQueryParams = {+ applicationRegistrationId: string;+ workspaceId: string;+ periodStart: string;+ periodEnd: string;+ bucketSizeInSeconds: number;+};++type GetApplicationMonitoringArgs = {+ applicationRegistrationId: string;+ viewerWorkspaceId: string;+ periodStart?: Date;+ periodEnd?: Date;+};@Injectable()export class ApplicationMonitoringService {constructor(private readonly clickHouseService: ClickHouseService,private readonly eventLogRetentionService: EventLogRetentionService,+ private readonly fileUrlService: FileUrlService,+ @InjectRepository(WorkspaceEntity)+ private readonly workspaceRepository: Repository<WorkspaceEntity>,) {}- async getMonitoring({+ async getMonitoring(+ args: GetApplicationMonitoringArgs,+ ): Promise<ApplicationMonitoringDTO> {+ const { params, period, lookbackInHours } =+ await this.resolveQueryParams(args);++ return this.queryMonitoring({ params, period, lookbackInHours });+ }++ async getAdminMonitoring({+ workspaceId,+ ...args+ }: GetApplicationMonitoringArgs & {+ workspaceId?: string;+ }): Promise<AdminApplicationMonitoringDTO> {+ const { params, period, lookbackInHours } = await this.resolveQueryParams({+ ...args,+ workspaceId,+ });++ const [monitoring, activeWorkspaceCountRows, workspaceRows] =+ await Promise.all([+ this.queryMonitoring({ params, period, lookbackInHours }),+ this.clickHouseService.selectOrThrow<ApplicationMonitoringActiveWorkspaceCountRow>(+ APPLICATION_MONITORING_QUERIES.activeWorkspaceCount,+ params,+ ),+ this.clickHouseService.selectOrThrow<ApplicationMonitoringWorkspaceRow>(+ APPLICATION_MONITORING_QUERIES.workspaces,+ params,+ ),+ ]);++ const workspaces = await this.workspaceRepository.find({+ where: { id: In(workspaceRows.map((row) => row.workspaceId)) },+ select: ['id', 'displayName', 'logoFileId'],+ withDeleted: true,+ });++ return {+ ...monitoring,+ activeWorkspaceCount: Number(+ activeWorkspaceCountRows[0]?.activeWorkspaceCount ?? 0,+ ),+ workspaces: mapApplicationMonitoringWorkspaceRows({+ rows: workspaceRows,+ workspaces: await Promise.all(+ workspaces.map(async (workspace) => ({+ workspaceId: workspace.id,+ workspaceName: workspace.displayName ?? null,+ workspaceLogoUrl:+ await this.fileUrlService.signWorkspaceLogoUrl(workspace),+ })),+ ),+ }),+ };+ }++ private async resolveQueryParams({applicationRegistrationId,viewerWorkspaceId,periodStart,periodEnd,- }: {- applicationRegistrationId: string;- viewerWorkspaceId: string;- periodStart?: Date;- periodEnd?: Date;- }): Promise<ApplicationMonitoringDTO> {+ workspaceId,+ }: GetApplicationMonitoringArgs & { workspaceId?: string }): Promise<{+ params: ApplicationMonitoringQueryParams;+ period: ApplicationMonitoringPeriod;+ lookbackInHours: number;+ }> {const lookbackInHours = getApplicationMonitoringLookbackInHours({hasAuditLogsEntitlement:await this.eventLogRetentionService.hasAuditLogsEntitlement(@@ -48,13 +136,28 @@ export class ApplicationMonitoringService {lookbackInHours,});- const params = {- applicationRegistrationId,- periodStart: formatDateTimeForClickHouse(period.periodStart),- periodEnd: formatDateTimeForClickHouse(period.periodEnd),- bucketSizeInSeconds: period.bucketSizeInSeconds,+ return {+ params: {+ applicationRegistrationId,+ workspaceId: workspaceId ?? '',+ periodStart: formatDateTimeForClickHouse(period.periodStart),+ periodEnd: formatDateTimeForClickHouse(period.periodEnd),+ bucketSizeInSeconds: period.bucketSizeInSeconds,+ },+ period,+ lookbackInHours,};+ }+ private async queryMonitoring({+ params,+ period,+ lookbackInHours,+ }: {+ params: ApplicationMonitoringQueryParams;+ period: ApplicationMonitoringPeriod;+ lookbackInHours: number;+ }): Promise<ApplicationMonitoringDTO> {const [totals, activity, lifecycle, issues, versions, functions] =await Promise.all([this.clickHouseService.selectOrThrow<ApplicationMonitoringTotalsRow>(diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-queries.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-queries.constant.tsindex 90624a6e374..fba17c4217e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-queries.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-queries.constant.ts@@ -1,8 +1,10 @@import { APPLICATION_MONITORING_BREAKDOWN_LIMIT } from 'src/engine/core-modules/application/application-monitoring/constants/application-monitoring-breakdown-limit.constant';+import { APPLICATION_MONITORING_WORKSPACE_BREAKDOWN_LIMIT } from 'src/engine/core-modules/application/application-monitoring/constants/application-monitoring-workspace-breakdown-limit.constant';const PERIOD_FILTER = `applicationRegistrationId = {applicationRegistrationId:String}AND timestamp >= {periodStart:DateTime64(3)}- AND timestamp < {periodEnd:DateTime64(3)}`;+ AND timestamp < {periodEnd:DateTime64(3)}+ AND ({workspaceId:String} = '' OR workspaceId = {workspaceId:String})`;const LIFECYCLE_SOURCES = `('INSTALL', 'UPGRADE', 'UNINSTALL')`;@@ -77,4 +79,21 @@ export const APPLICATION_MONITORING_QUERIES = {GROUP BY logicFunctionNameORDER BY runCount DESCLIMIT ${APPLICATION_MONITORING_BREAKDOWN_LIMIT}`,+ activeWorkspaceCount: `+ SELECT uniqExact(workspaceId) AS activeWorkspaceCount+ FROM applicationMetricEvent+ WHERE ${PERIOD_FILTER}`,+ workspaces: `+ SELECT+ workspaceId,+ argMaxIf(applicationVersion, timestamp, ${RUNS_ON_VERSION}) AS applicationVersion,+ countIf(source = 'LOGIC_FUNCTION') AS runCount,+ countIf(source = 'LOGIC_FUNCTION' AND level = 'ERROR') AS failedRunCount,+ countIf(source IN ('API_RATE_LIMIT', 'JOB_RATE_LIMIT')) AS rateLimitEventCount,+ max(timestamp) AS lastEventAt+ FROM applicationMetricEvent+ WHERE ${PERIOD_FILTER}+ GROUP BY workspaceId+ ORDER BY failedRunCount DESC, runCount DESC+ LIMIT ${APPLICATION_MONITORING_WORKSPACE_BREAKDOWN_LIMIT}`,} as const;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-workspace-breakdown-limit.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-workspace-breakdown-limit.constant.tsnew file mode 100644index 00000000000..706010ebf65--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/constants/application-monitoring-workspace-breakdown-limit.constant.ts@@ -0,0 +1 @@+export const APPLICATION_MONITORING_WORKSPACE_BREAKDOWN_LIMIT = 20;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto.tsnew file mode 100644index 00000000000..ca9245d5060--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto.ts@@ -0,0 +1,39 @@+import { Field, Int, ObjectType } from '@nestjs/graphql';++import { ApplicationMonitoringDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/application-monitoring.dto';++@ObjectType('ApplicationMonitoringWorkspace')+export class ApplicationMonitoringWorkspaceDTO {+ @Field(() => String)+ workspaceId: string;++ @Field(() => String, { nullable: true })+ workspaceName: string | null;++ @Field(() => String, { nullable: true })+ workspaceLogoUrl: string | null;++ @Field(() => String)+ applicationVersion: string;++ @Field(() => Int)+ runCount: number;++ @Field(() => Int)+ failedRunCount: number;++ @Field(() => Int)+ rateLimitEventCount: number;++ @Field(() => Date)+ lastEventAt: Date;+}++@ObjectType('AdminApplicationMonitoring')+export class AdminApplicationMonitoringDTO extends ApplicationMonitoringDTO {+ @Field(() => Int)+ activeWorkspaceCount: number;++ @Field(() => [ApplicationMonitoringWorkspaceDTO])+ workspaces: ApplicationMonitoringWorkspaceDTO[];+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type.tsindex e77677a799d..007e6112d3e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type.ts@@ -55,3 +55,16 @@ export type ApplicationMonitoringRows = {versions: ApplicationMonitoringVersionRow[];functions: ApplicationMonitoringFunctionRow[];};++export type ApplicationMonitoringActiveWorkspaceCountRow = {+ activeWorkspaceCount: ClickHouseCount;+};++export type ApplicationMonitoringWorkspaceRow = {+ workspaceId: string;+ applicationVersion: string;+ runCount: ClickHouseCount;+ failedRunCount: ClickHouseCount;+ rateLimitEventCount: ClickHouseCount;+ lastEventAt: string;+};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/__tests__/map-application-monitoring-workspace-rows.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/__tests__/map-application-monitoring-workspace-rows.util.spec.tsnew file mode 100644index 00000000000..ac708fb5519--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/__tests__/map-application-monitoring-workspace-rows.util.spec.ts@@ -0,0 +1,56 @@+import { mapApplicationMonitoringWorkspaceRows } from 'src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-workspace-rows.util';++describe('mapApplicationMonitoringWorkspaceRows', () => {+ it('names each workspace with its logo and converts ClickHouse values', () => {+ expect(+ mapApplicationMonitoringWorkspaceRows({+ rows: [+ {+ workspaceId: 'workspace-1',+ applicationVersion: '1.2.3',+ runCount: '1240',+ failedRunCount: '49',+ rateLimitEventCount: '0',+ lastEventAt: '2026-10-19 08:41:12.204',+ },+ {+ workspaceId: 'deleted-workspace',+ applicationVersion: '1.2.2',+ runCount: 3,+ failedRunCount: 0,+ rateLimitEventCount: 1,+ lastEventAt: '2026-10-01 10:00:00',+ },+ ],+ workspaces: [+ {+ workspaceId: 'workspace-1',+ workspaceName: 'Acme Corp',+ workspaceLogoUrl: 'https://files.example.com/acme-logo.png',+ },+ ],+ }),+ ).toEqual([+ {+ workspaceId: 'workspace-1',+ workspaceName: 'Acme Corp',+ workspaceLogoUrl: 'https://files.example.com/acme-logo.png',+ applicationVersion: '1.2.3',+ runCount: 1240,+ failedRunCount: 49,+ rateLimitEventCount: 0,+ lastEventAt: new Date('2026-10-19T08:41:12.204Z'),+ },+ {+ workspaceId: 'deleted-workspace',+ workspaceName: null,+ workspaceLogoUrl: null,+ applicationVersion: '1.2.2',+ runCount: 3,+ failedRunCount: 0,+ rateLimitEventCount: 1,+ lastEventAt: new Date('2026-10-01T10:00:00.000Z'),+ },+ ]);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-workspace-rows.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-workspace-rows.util.tsnew file mode 100644index 00000000000..a89e524e617--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-monitoring/utils/map-application-monitoring-workspace-rows.util.ts@@ -0,0 +1,30 @@+import { parseClickHouseDateTime } from 'src/database/clickhouse/utils/parse-clickhouse-date-time.util';+import { type ApplicationMonitoringWorkspaceDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto';+import { type ApplicationMonitoringWorkspaceRow } from 'src/engine/core-modules/application/application-monitoring/types/application-monitoring-rows.type';++export const mapApplicationMonitoringWorkspaceRows = ({+ rows,+ workspaces,+}: {+ rows: ApplicationMonitoringWorkspaceRow[];+ workspaces: Pick<+ ApplicationMonitoringWorkspaceDTO,+ 'workspaceId' | 'workspaceName' | 'workspaceLogoUrl'+ >[];+}): ApplicationMonitoringWorkspaceDTO[] => {+ const workspaceById = new Map(+ workspaces.map((workspace) => [workspace.workspaceId, workspace]),+ );++ return rows.map((row) => ({+ workspaceId: row.workspaceId,+ workspaceName: workspaceById.get(row.workspaceId)?.workspaceName ?? null,+ workspaceLogoUrl:+ workspaceById.get(row.workspaceId)?.workspaceLogoUrl ?? null,+ applicationVersion: row.applicationVersion,+ runCount: Number(row.runCount),+ failedRunCount: Number(row.failedRunCount),+ rateLimitEventCount: Number(row.rateLimitEventCount),+ lastEventAt: parseClickHouseDateTime(row.lastEventAt),+ }));+};diff --git a/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap b/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snapindex efc093e5b1d..8556684b8de 100644--- a/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/endpoint-permissions/__snapshots__/endpoint-permission-declarations.integration-spec.ts.snap@@ -2,6 +2,7 @@exports[`endpoint permission declarations should match the auth principals, permission flags, feature flags and application target of every mounted endpoint 1`] = `[+ "AdminApplicationMonitoringResolver.findAdminApplicationRegistrationMonitoring {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":["IS_APPLICATION_MONITORING_ENABLED"],"requiredPermissionFlags":[]}","AdminPanelAiProviderResolver.addAiProvider {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}","AdminPanelAiProviderResolver.addModelToProvider {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}","AdminPanelAiProviderResolver.getAiProviders {"applicationTarget":null,"authPrincipalGuards":[{"apiKey":false,"application":{"withAgent":false,"withUser":false,"withoutUser":false},"oauthClient":{"withUser":false,"withoutUser":false},"userSession":{"impersonated":true,"playground":true,"standard":true,"workspaceAgnostic":false}}],"requiredFeatureFlags":[],"requiredPermissionFlags":[]}",diff --git a/packages/twenty-server/test/integration/metadata/suites/application-monitoring/admin-application-registration-monitoring.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-monitoring/admin-application-registration-monitoring.integration-spec.tsnew file mode 100644index 00000000000..5a1d4a01928--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-monitoring/admin-application-registration-monitoring.integration-spec.ts@@ -0,0 +1,163 @@+import crypto from 'crypto';+import process from 'process';++import {+ type ClickHouseClient,+ ClickHouseLogLevel,+ createClient,+} from '@clickhouse/client';+import { deleteApplicationRegistration } from 'test/integration/metadata/suites/application-registration/utils/delete-application-registration.util';+import { insertApplicationRegistrationWithVariable } from 'test/integration/metadata/suites/application-registration/utils/insert-application-registration-with-variable.util';+import { findAdminApplicationRegistrationMonitoring } from 'test/integration/metadata/suites/application-monitoring/utils/find-admin-application-registration-monitoring.util';++import { formatDateTimeForClickHouse } from 'src/database/clickhouse/utils/format-date-time-for-clickhouse.util';+import {+ SEED_APPLE_WORKSPACE_ID,+ SEED_YCOMBINATOR_WORKSPACE_ID,+} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++const buildRunEvent = ({+ applicationRegistrationId,+ workspaceId,+ minutesAgo,+ level,+}: {+ applicationRegistrationId: string;+ workspaceId: string;+ minutesAgo: number;+ level: 'INFO' | 'ERROR';+}) => ({+ timestamp: formatDateTimeForClickHouse(+ new Date(Date.now() - minutesAgo * 60_000),+ ),+ applicationRegistrationId,+ workspaceId,+ applicationId: crypto.randomUUID(),+ applicationVersion: '1.2.3',+ source: 'LOGIC_FUNCTION',+ logicFunctionId: crypto.randomUUID(),+ logicFunctionName: 'syncContacts',+ level,+ errorCode: level === 'ERROR' ? 'TypeError' : '',+ durationMs: 120,+});++describe('Admin application registration monitoring (integration)', () => {+ let clickHouseClient: ClickHouseClient;+ let applicationRegistrationId: string;++ beforeAll(async () => {+ clickHouseClient = createClient({+ url: process.env.CLICKHOUSE_URL,+ log: { level: ClickHouseLogLevel.OFF },+ });++ ({ applicationRegistrationId } =+ await insertApplicationRegistrationWithVariable({+ name: 'Admin Monitored Registration',+ }));++ await clickHouseClient.insert({+ table: 'applicationMetricEvent',+ format: 'JSONEachRow',+ values: [+ buildRunEvent({+ applicationRegistrationId,+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ minutesAgo: 5,+ level: 'INFO',+ }),+ buildRunEvent({+ applicationRegistrationId,+ workspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,+ minutesAgo: 10,+ level: 'ERROR',+ }),+ buildRunEvent({+ applicationRegistrationId,+ workspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,+ minutesAgo: 15,+ level: 'ERROR',+ }),+ {+ ...buildRunEvent({+ applicationRegistrationId,+ workspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,+ minutesAgo: 1,+ level: 'ERROR',+ }),+ applicationVersion: '2.0.0',+ source: 'UPGRADE',+ logicFunctionId: '',+ logicFunctionName: '',+ errorCode: 'UPGRADE_FAILED',+ },+ ],+ });+ });++ afterAll(async () => {+ await clickHouseClient.command({+ query:+ 'ALTER TABLE applicationMetricEvent DELETE WHERE applicationRegistrationId = {applicationRegistrationId:String}',+ query_params: { applicationRegistrationId },+ });+ await clickHouseClient.close();++ await deleteApplicationRegistration({+ input: { id: applicationRegistrationId },+ expectToFail: false,+ });+ });++ it('breaks the app down by named workspace, most failing first', async () => {+ const { data, errors } = await findAdminApplicationRegistrationMonitoring({+ id: applicationRegistrationId,+ });++ expect(errors).toBeUndefined();++ const monitoring = data.findAdminApplicationRegistrationMonitoring;++ expect(monitoring.runCount).toBe(3);+ expect(monitoring.activeWorkspaceCount).toBe(2);+ expect(monitoring.workspaces).toEqual([+ expect.objectContaining({+ workspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,+ workspaceName: expect.any(String),+ applicationVersion: '1.2.3',+ runCount: 2,+ failedRunCount: 2,+ }),+ expect.objectContaining({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ workspaceName: expect.any(String),+ runCount: 1,+ failedRunCount: 0,+ }),+ ]);+ });++ it('narrows every aggregate to one workspace', async () => {+ const { data } = await findAdminApplicationRegistrationMonitoring({+ id: applicationRegistrationId,+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ });++ const monitoring = data.findAdminApplicationRegistrationMonitoring;++ expect(monitoring.runCount).toBe(1);+ expect(monitoring.failedRunCount).toBe(0);+ expect(monitoring.activeWorkspaceCount).toBe(1);+ });++ it('refuses users who are not server admins', async () => {+ const { errors } = await findAdminApplicationRegistrationMonitoring({+ id: applicationRegistrationId,+ expectToFail: true,+ asNonServerAdmin: true,+ });++ expect(errors).toBeDefined();+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application-monitoring/utils/find-admin-application-registration-monitoring.util.ts b/packages/twenty-server/test/integration/metadata/suites/application-monitoring/utils/find-admin-application-registration-monitoring.util.tsnew file mode 100644index 00000000000..6893f3ca87e--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-monitoring/utils/find-admin-application-registration-monitoring.util.ts@@ -0,0 +1,73 @@+import gql from 'graphql-tag';+import { makeAdminPanelApiRequestAsNonServerAdmin } from 'test/integration/graphql/suites/admin-panel/utils/make-admin-panel-api-request-as-non-server-admin.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';+import { makeAdminPanelApiRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';++import { type AdminApplicationMonitoringDTO } from 'src/engine/core-modules/application/application-monitoring/dtos/admin-application-monitoring.dto';++export const findAdminApplicationRegistrationMonitoring = async ({+ id,+ workspaceId,+ expectToFail = false,+ asNonServerAdmin = false,+}: {+ id: string;+ workspaceId?: string;+ expectToFail?: boolean;+ asNonServerAdmin?: boolean;+}): CommonResponseBody<{+ findAdminApplicationRegistrationMonitoring: AdminApplicationMonitoringDTO;+}> => {+ const graphqlOperation = {+ query: gql`+ query FindAdminApplicationRegistrationMonitoring(+ $id: String!+ $workspaceId: String+ ) {+ findAdminApplicationRegistrationMonitoring(+ id: $id+ workspaceId: $workspaceId+ ) {+ runCount+ failedRunCount+ activeWorkspaceCount+ workspaces {+ workspaceId+ workspaceName+ workspaceLogoUrl+ applicationVersion+ runCount+ failedRunCount+ rateLimitEventCount+ lastEventAt+ }+ }+ }+ `,+ variables: { id, workspaceId },+ };++ const response = asNonServerAdmin+ ? await makeAdminPanelApiRequestAsNonServerAdmin(graphqlOperation)+ : await makeAdminPanelApiRequest(graphqlOperation);++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Finding admin application registration monitoring should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Finding admin application registration monitoring has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};