feat(observability): update retention management for tenants

resolves: #MAOBS-147

Signed-off-by: David Arsène <[email protected]>

Author: darsene

packages/manager/apps/observability/public/translations/shared/Messages_fr_FR.json

@@ -1,4 +1,9 @@
 {
   "mandatory":"obligatoire",
-  "service":"Service <strong>{{serviceName}}</strong>"
+  "service":"Service <strong>{{serviceName}}</strong>",
+  "form":{
+    "bounds": {
+      "helper": "Le minimum est de {{min}} et le maximum est de {{max}}."
+    }
+  }
 }

packages/manager/apps/observability/public/translations/tenants/Messages_fr_FR.json

@@ -15,27 +15,31 @@
   },
   "delete": {
     "delete_tenant_title": "Supprimer le Tenant",
-    "delete_tenant_description": "Êtes-vous sûr de vouloir supprimer le tenant \"{{tenantName}}\""
+    "delete_tenant_description": "Êtes-vous sûr de vouloir supprimer le tenant \"{{tenantName}}\"",
+    "success": "Le tenant a été supprimé avec succès"
   },
   "onboarding": {
     "description": "Créez votre nouveau tenant pour continuer à explorer tout le potentiel des métriques d'observabilité. Vous pourrez envoyer des données, créer des tableaux de bord et configurer des alertes adaptées à vos besoins spécifiques.",
     "orderButtonLabel": "Créez votre tenant"
   },
   "creation": {
     "title": "Créer un tenant",
+    "success": "Le tenant a été créé avec succès",
     "tenantInformation": "Saisir les informations du tenant",
     "namePlaceholder": "Nom du tenant", 
     "description":"Description (optionnelle)",
     "descriptionPlaceholder": "Ajoutez une description des metrics que vous allez écrire dans ce tenant"
   },
   "edition": {
     "title": "Modifier le tenant",
-    "subtitle": "Vous créez un tenant dans votre service d'observabilité \"{{tenantName}}\""
+    "subtitle": "Vous créez un tenant dans votre service d'observabilité \"{{tenantName}}\"",
+    "success": "Le tenant a été modifié avec succès"
   },
   "configuration": {
     "title": "Configurez votre tenant",
-    "retention": "Rétention",
-    "retentionPlaceholder": "Sélectionnez la rétention des données",
+    "retention":{
+      "title": "Rétention"
+    },
     "limit": {
       "title": "Limite d'ingestion (métriques actives)",
       "description": "Définissez la limite maximale du nombre de métriques actives pour ce tenant."

packages/manager/apps/observability/src/__mocks__/infrastructures/infrastructures.mock.ts

@@ -1,6 +1,25 @@
 import { InfrastructuresParams, RetentionParams } from '@/data/api/infrastructures.props';
 import { Infrastructure, Retention } from '@/types/infrastructures.type';
 
+const defaultExtraSettings = {
+  mimir: {
+    configurable: {
+      compactor_blocks_retention_period: {
+        default: '30d',
+        min: '7d',
+        max: '400d',
+        type: 'DURATION' as const,
+      },
+      max_global_series_per_user: {
+        default: 1000000,
+        min: 100000,
+        max: 10000000,
+        type: 'NUMERIC' as const,
+      },
+    },
+  },
+};
+
 const infrastructures: Infrastructure[] = [
   {
     id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
@@ -9,6 +28,7 @@ const infrastructures: Infrastructure[] = [
       type: 'SHARED',
       usage: 'METRICS',
       entryPoint: 'eee.metrics.ovh.com',
+      extraSettings: defaultExtraSettings,
     },
   },
   {
@@ -18,6 +38,7 @@ const infrastructures: Infrastructure[] = [
       type: 'SHARED',
       usage: 'METRICS',
       entryPoint: 'aaa.metrics.ovh.com',
+      extraSettings: defaultExtraSettings,
     },
   },
   {
@@ -27,6 +48,7 @@ const infrastructures: Infrastructure[] = [
       type: 'SHARED',
       usage: 'METRICS',
       entryPoint: 'bbb.metrics.ovh.com',
+      extraSettings: defaultExtraSettings,
     },
   },
   {
@@ -36,6 +58,7 @@ const infrastructures: Infrastructure[] = [
       type: 'SHARED',
       usage: 'METRICS',
       entryPoint: 'ccc.metrics.ovh.com',
+      extraSettings: defaultExtraSettings,
     },
   },
   {
@@ -45,6 +68,7 @@ const infrastructures: Infrastructure[] = [
       type: 'SHARED',
       usage: 'METRICS',
       entryPoint: 'ddd.metrics.ovh.com',
+      extraSettings: defaultExtraSettings,
     },
   },
 ];

packages/manager/apps/observability/src/__mocks__/mock.config.ts

@@ -2,9 +2,9 @@ export type ApiConfigMode = 'mock' | 'api';
 export type ApiEndpoint = 'tenant' | 'service' | 'infrastructure' | 'grafana' | 'log' | 'metric';
 
 export const apiConfig: Record<ApiEndpoint, ApiConfigMode> = {
-  tenant: 'mock',
+  tenant: 'api',
   service: 'api',
-  infrastructure: 'mock', // FIXME : fix retentions first before unmocking
+  infrastructure: 'api',
   grafana: 'mock',
   log: 'mock',
   metric: 'mock',

packages/manager/apps/observability/src/__mocks__/tenants/tenant.mock.ts

@@ -31,24 +31,16 @@ const tenantsDataset: Tenant[] = [
       title: 'Tenant 1',
       description: 'Tenant 1 description',
       limits: {
-        numberOfSeries: {
-          current: 222,
-          maximum: 300,
-        },
-        retention: {
-          id: '1',
-          duration: 'P1M',
-          link: 'retention_link_1',
+        mimir: {
+          compactor_blocks_retention_period: '30d',
+          max_global_series_per_user: 300,
         },
       },
       infrastructure: {
         id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
-        currentState: {
-          location: 'eu-west-sbg',
-          entryPoint: 'sbg1.metrics.ovh.com',
-          type: 'SHARED',
-          usage: 'METRICS',
-        },
+        location: 'eu-west-sbg',
+        entryPoint: 'sbg1.metrics.ovh.com',
+        type: 'SHARED',
       },
     },
   },
@@ -67,24 +59,16 @@ const tenantsDataset: Tenant[] = [
       title: 'Tenant 2',
       description: 'Tenant 2 description',
       limits: {
-        numberOfSeries: {
-          current: 36,
-          maximum: 50,
-        },
-        retention: {
-          id: '2',
-          duration: 'P3M',
-          link: 'retention_link_2',
+        mimir: {
+          compactor_blocks_retention_period: '90d',
+          max_global_series_per_user: 50,
         },
       },
       infrastructure: {
         id: '6ee8fb35-2621-4530-a288-84fc0e85dac1',
-        currentState: {
-          entryPoint: 'gra1.metrics.ovh.com',
-          location: 'eu-west-gra',
-          type: 'SHARED',
-          usage: 'METRICS',
-        },
+        entryPoint: 'gra1.metrics.ovh.com',
+        location: 'eu-west-gra',
+        type: 'SHARED',
       },
     },
   },

packages/manager/apps/observability/src/__tests__/components/dashboard/ConfigurationTile.component.spec.tsx

@@ -3,8 +3,8 @@ import { vi } from 'vitest';
 
 import { ConfigurationTile } from '@/components/dashboard/ConfigurationTile.component';
 
-const { mockFormatDuration } = vi.hoisted(() => ({
-  mockFormatDuration: vi.fn(),
+const { mockFormatObservabilityDuration } = vi.hoisted(() => ({
+  mockFormatObservabilityDuration: vi.fn(),
 }));
 
 vi.mock('react-i18next', () => ({
@@ -43,7 +43,7 @@ vi.mock('@ovhcloud/ods-react', () => ({
 }));
 
 vi.mock('@/utils/duration.utils', () => ({
-  formatDuration: mockFormatDuration,
+  formatObservabilityDuration: mockFormatObservabilityDuration,
 }));
 
 describe('ConfigurationTile.component', () => {
@@ -55,7 +55,7 @@ describe('ConfigurationTile.component', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockFormatDuration.mockReturnValue('10 days');
+    mockFormatObservabilityDuration.mockReturnValue('10 days');
   });
 
   it('renders skeletons while data is loading', () => {
@@ -67,7 +67,10 @@ describe('ConfigurationTile.component', () => {
   it('renders formatted retention and metric limits when available', () => {
     render(<ConfigurationTile {...baseProps} isLoading={false} />);
 
-    expect(mockFormatDuration).toHaveBeenCalledWith(baseProps.retention, 'test-locale');
+    expect(mockFormatObservabilityDuration).toHaveBeenCalledWith(
+      baseProps.retention,
+      'test-locale',
+    );
     expect(screen.getByText('10 days')).toBeInTheDocument();
     expect(screen.getByText(String(baseProps.numberOfSeriesCurrent))).toBeInTheDocument();
     expect(screen.getByText(String(baseProps.numberOfSeriesMaximum))).toBeInTheDocument();
@@ -83,6 +86,6 @@ describe('ConfigurationTile.component', () => {
       />,
     );
 
-    expect(mockFormatDuration).not.toHaveBeenCalled();
+    expect(mockFormatObservabilityDuration).not.toHaveBeenCalled();
   });
 });

packages/manager/apps/observability/src/__tests__/components/dashboard/drawer/EditTenantDrawer.component.spec.tsx

@@ -4,7 +4,6 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { vi } from 'vitest';
 
 import EditTenantDrawer from '@/components/drawer/EditTenantDrawer.component';
-import { INGESTION_BOUNDS } from '@/utils/tenants.constants';
 
 const { mockNavigate, mockUseTenant, mockUseEditTenant, mockUseTenantsFormSchema } = vi.hoisted(
   () => ({
@@ -82,6 +81,10 @@ vi.mock('@ovh-ux/muk', () => ({
       </footer>
     ),
   },
+  useNotifications: () => ({
+    addSuccess: vi.fn(),
+    addError: vi.fn(),
+  }),
 }));
 
 vi.mock('@ovhcloud/ods-react', () => ({
@@ -136,12 +139,9 @@ describe('EditTenantDrawer.component', () => {
         id: 'infra-1',
       },
       limits: {
-        retention: {
-          id: 'ret-30',
-        },
-        numberOfSeries: {
-          maximum: 1500,
-          current: 900,
+        mimir: {
+          compactor_blocks_retention_period: '30d',
+          max_global_series_per_user: 1500,
         },
       },
     },
@@ -188,11 +188,10 @@ describe('EditTenantDrawer.component', () => {
         title: tenant.currentState.title,
         description: tenant.currentState.description,
         infrastructureId: tenant.currentState.infrastructure?.id ?? '',
-        retentionId: tenant.currentState.limits?.retention?.id ?? '',
-        maxSeries:
-          tenant.currentState.limits?.numberOfSeries?.maximum ??
-          tenant.currentState.limits?.numberOfSeries?.current ??
-          INGESTION_BOUNDS.DEFAULT,
+        retentionDuration:
+          tenant.currentState.limits?.mimir?.compactor_blocks_retention_period ?? '',
+        retentionUnit: '',
+        maxSeries: tenant.currentState.limits?.mimir?.max_global_series_per_user ?? null,
       });
     });
   });
@@ -202,7 +201,8 @@ describe('EditTenantDrawer.component', () => {
       title: 'Updated tenant',
       description: 'Updated description',
       infrastructureId: 'infra-42',
-      retentionId: 'ret-60',
+      retentionDuration: '30',
+      retentionUnit: 'd',
       maxSeries: 5000,
     };
     mockForm.handleSubmit.mockImplementation(
@@ -220,15 +220,10 @@ describe('EditTenantDrawer.component', () => {
       targetSpec: {
         title: formValues.title,
         description: formValues.description,
-        infrastructure: {
-          id: formValues.infrastructureId,
-        },
         limits: {
-          numberOfSeries: {
-            maximum: formValues.maxSeries ?? INGESTION_BOUNDS.DEFAULT,
-          },
-          retention: {
-            id: formValues.retentionId,
+          mimir: {
+            compactor_blocks_retention_period: '30d',
+            max_global_series_per_user: formValues.maxSeries,
           },
         },
       },