chore: update schemas

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) {

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';

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

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;
+};

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(

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(