From 9c045e8bfc3641a5cf7d1a1556ab4dc20a7eb96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Tue, 21 Oct 2025 13:48:06 +0100 Subject: [PATCH] chore: update schemas --- .../InstanceStats/InstanceStats.tsx | 1 - frontend/src/openapi/models/index.ts | 1 + .../models/instanceAdminStatsSchema.ts | 3 +++ .../instanceAdminStatsSchemaEdgeInstances.ts | 26 +++++++++++++++++++ .../instance-stats-service.test.ts | 2 ++ src/lib/metrics.test.ts | 2 ++ 6 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 frontend/src/openapi/models/instanceAdminStatsSchemaEdgeInstances.ts diff --git a/frontend/src/component/admin/instance-admin/InstanceStats/InstanceStats.tsx b/frontend/src/component/admin/instance-admin/InstanceStats/InstanceStats.tsx index 3edda6f7ba..ba028b891b 100644 --- a/frontend/src/component/admin/instance-admin/InstanceStats/InstanceStats.tsx +++ b/frontend/src/component/admin/instance-admin/InstanceStats/InstanceStats.tsx @@ -65,7 +65,6 @@ export const InstanceStats: FC = () => { }, { title: 'Release templates', value: stats?.releaseTemplates }, { title: 'Release plans', value: stats?.releasePlans }, - { title: 'Edge instances', value: stats?.edgeInstances }, ]; if (stats?.versionEnterprise) { diff --git a/frontend/src/openapi/models/index.ts b/frontend/src/openapi/models/index.ts index bd9705b163..f018276101 100644 --- a/frontend/src/openapi/models/index.ts +++ b/frontend/src/openapi/models/index.ts @@ -967,6 +967,7 @@ export * from './instanceAdminStatsSchemaActiveUsers.js'; export * from './instanceAdminStatsSchemaApiTokens.js'; export * from './instanceAdminStatsSchemaClientAppsItem.js'; export * from './instanceAdminStatsSchemaClientAppsItemRange.js'; +export * from './instanceAdminStatsSchemaEdgeInstances.js'; export * from './instanceAdminStatsSchemaPreviousDayMetricsBucketsCount.js'; export * from './instanceAdminStatsSchemaProductionChanges.js'; export * from './instanceInsightsSchema.js'; diff --git a/frontend/src/openapi/models/instanceAdminStatsSchema.ts b/frontend/src/openapi/models/instanceAdminStatsSchema.ts index d19b3028b2..644e878983 100644 --- a/frontend/src/openapi/models/instanceAdminStatsSchema.ts +++ b/frontend/src/openapi/models/instanceAdminStatsSchema.ts @@ -6,6 +6,7 @@ import type { InstanceAdminStatsSchemaActiveUsers } from './instanceAdminStatsSchemaActiveUsers.js'; import type { InstanceAdminStatsSchemaApiTokens } from './instanceAdminStatsSchemaApiTokens.js'; import type { InstanceAdminStatsSchemaClientAppsItem } from './instanceAdminStatsSchemaClientAppsItem.js'; +import type { InstanceAdminStatsSchemaEdgeInstances } from './instanceAdminStatsSchemaEdgeInstances.js'; import type { InstanceAdminStatsSchemaPreviousDayMetricsBucketsCount } from './instanceAdminStatsSchemaPreviousDayMetricsBucketsCount.js'; import type { InstanceAdminStatsSchemaProductionChanges } from './instanceAdminStatsSchemaProductionChanges.js'; @@ -24,6 +25,8 @@ export interface InstanceAdminStatsSchema { * @minimum 0 */ contextFields?: number; + /** The billable number of edge instances in the last 30, 60 and 90 days */ + edgeInstances?: InstanceAdminStatsSchemaEdgeInstances; /** * The number of environments defined in this instance * @minimum 0 diff --git a/frontend/src/openapi/models/instanceAdminStatsSchemaEdgeInstances.ts b/frontend/src/openapi/models/instanceAdminStatsSchemaEdgeInstances.ts new file mode 100644 index 0000000000..38a7e4f064 --- /dev/null +++ b/frontend/src/openapi/models/instanceAdminStatsSchemaEdgeInstances.ts @@ -0,0 +1,26 @@ +/** + * Generated by Orval + * Do not edit manually. + * See `gen:api` script in package.json + */ + +/** + * The billable number of edge instances in the last 30, 60 and 90 days + */ +export type InstanceAdminStatsSchemaEdgeInstances = { + /** + * The billable number of edge instances in the last 30 days + * @minimum 0 + */ + last30?: number; + /** + * The billable number of edge instances in the last 60 days + * @minimum 0 + */ + last60?: number; + /** + * The billable number of edge instances in the last 90 days + * @minimum 0 + */ + last90?: number; +}; diff --git a/src/lib/features/instance-stats/instance-stats-service.test.ts b/src/lib/features/instance-stats/instance-stats-service.test.ts index e3786c609a..fc0955ab62 100644 --- a/src/lib/features/instance-stats/instance-stats-service.test.ts +++ b/src/lib/features/instance-stats/instance-stats-service.test.ts @@ -14,6 +14,7 @@ import type { import { createFakeGetLicensedUsers } from './getLicensedUsers.js'; import { vi } from 'vitest'; import { DEFAULT_ENV } from '../../server-impl.js'; +import { createFakeGetEdgeInstances } from './getEdgeInstances.js'; let instanceStatsService: InstanceStatsService; let versionService: VersionService; @@ -39,6 +40,7 @@ beforeEach(() => { createFakeGetActiveUsers(), createFakeGetProductionChanges(), createFakeGetLicensedUsers(), + createFakeGetEdgeInstances(), ); const { collectAggDbMetrics } = registerPrometheusMetrics( diff --git a/src/lib/metrics.test.ts b/src/lib/metrics.test.ts index 8a255365e8..7a55af52c3 100644 --- a/src/lib/metrics.test.ts +++ b/src/lib/metrics.test.ts @@ -40,6 +40,7 @@ import dbInit, { type ITestDb } from '../test/e2e/helpers/database-init.js'; import { FeatureLifecycleStore } from './features/feature-lifecycle/feature-lifecycle-store.js'; import { FeatureLifecycleReadModel } from './features/feature-lifecycle/feature-lifecycle-read-model.js'; import { createFakeGetLicensedUsers } from './features/instance-stats/getLicensedUsers.js'; +import { createFakeGetEdgeInstances } from './features/instance-stats/getEdgeInstances.js'; const monitor = createMetricsMonitor(); const eventBus = new EventEmitter(); @@ -79,6 +80,7 @@ beforeAll(async () => { createFakeGetActiveUsers(), createFakeGetProductionChanges(), createFakeGetLicensedUsers(), + createFakeGetEdgeInstances(), ); schedulerService = new SchedulerService(