refactor(service-monitor): migrate module from server by shikanime · Pull Request #2775 · cloud-pi-native/console

shikanime · 2026-09-24T10:24:44Z

Issues liées

Quel est le comportement actuel ?

Les routes GET /api/v1/health-services, GET /api/v1/complete-services et GET /api/v1/refresh-services sont servies par l'ancienne application Fastify apps/server, via le registre services de @cpn-console/hooks.

Quel est le nouveau comportement ?

Migration du module service-monitor vers apps/server-nestjs :

ServiceMonitorController : routes GET /health-services, GET /complete-services (admin ListSystem), GET /refresh-services (admin ManageSystem).
ServiceMonitorService : agrège les services de santé terminus de chaque module plugin (ArgoCDHealthService, GitlabHealthService, RegistryHealthService, KeycloakHealthService, NexusHealthService, SonarqubeHealthService, VaultHealthService). Aucune dépendance aux paquets @cpn-console/*-plugin ni au registre services de @cpn-console/hooks, tous deux appelés à être supprimés.
Le gating reproduit PluginModule et HealthzModule : ConditionalModule.registerWhen sur les variables USE_*, Keycloak toujours actif ; les sondes sont exécutées à l'initialisation du module.
Réalignement sur les conventions du dépôt : réutilisation de MonitorInfos et MonitorStatus de @cpn-console/shared (plus de type local dupliqué), narrow typé sans as conformément à la politique stricte du dépôt, titres legacy des plugins (ArgoCD, Gitlab, Harbor, Keycloak, Nexus, SonarQube, Vault), et cause renseigné sur les sondes en échec comme dans la registry legacy.
La PR nginx associée est empilée : chore(nginx-strangler): route service-monitor to server-nestjs #2776.

Cette PR introduit-elle un breaking change ?

Non.

Autres informations

Parité avec l'ancien serveur : mêmes routes, même schéma de réponse (MonitorInfos), mêmes permissions admin. Le nom affiché est le titre du plugin (ex. ArgoCD), comme avec le registre hooks.

github-actions · 2026-09-24T12:45:03Z

🤖 Hey !

A preview of the application is available at : https://console-pr-2775.dso.cpin-hp.numerique-interieur.fr

Please be patient, deployment may take a few minutes.

StephaneTrebel

La migration introduit quatre écarts bloquants de sécurité et de parité fonctionnelle. Ils doivent être corrigés avant la bascule Nginx de la MR empilée #2776.

shikanime · 2026-09-25T13:03:49Z

L'import AuthModule de ServiceMonitorModule est rapatrié ici depuis #2776 : le module migré doit fournir les dépendances de son UserGuard.

La PR de bascule (#2776) ne porte plus que apps/nginx-strangler/conf.d/routing.conf.

shikanime

Verdict : Commentaire

Le monitor migré reproduit fidèlement la sémantique legacy (sonde périodique, dernier état servi entre passes, cause masquée sur la route publique, états SonarQube et sonde Harbor complète repris). Les points bloquants soulevés sur les commits précédents semblent traités à head ; seul un fragilité mineure subsiste dans le mapping du probe terminus.

StephaneTrebel

La migration service-monitor remplace le registre legacy par des sondes Nest conditionnelles et conserve les trois niveaux d’accès ainsi que le format de réponse. Le ledger #1889 est global et non clos à l’échelle de cette PR ; fils résolus et CI verte sur cette tête.

shikanime

Revue du head 37a6405e — module service-monitor propre et bien cadré : le service agrège les health services terminus des modules plugins sans dépendre des paquets @cpn-console/*-plugin ni du registre hooks (les 7 dépendances plugin sont bien retirées de package.json, et plus aucun import résiduel sur le head), gating ConditionalModule.registerWhen sur USE_* avec Keycloak toujours actif, routes admin gardées (ListSystem / ManageSystem) en parité avec le legacy. fromHealthCheck(result, key) reçoit bien la clé d'indicator explicitement — pas de devinette sur la forme de unknown, narrow par type-guard, zéro cast as. 25 specs ajoutées, aucune supprimée. Les specs d'adaptation (registry-health monitor() sur /api/v2.0/health, sonarqube SONARQUBE_HEALTH_STATUS) reproduisent le comportement legacy documenté. Rien de bloquant.

Résumé des sévérités : 0 bloquant, 0 important, 2 nits.

Deduplicate the private isRecord copies in service-monitor.utils and sonarqube-health.service onto src/utils/record.utils, next to hasEntries. Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I86a0cc083756a99f4b7f47c8c7ce8a596a6a6964 Signed-off-by: Shikanime Deva <22115108+shikanime@users.noreply.github.com>

StephaneTrebel

✨ La migration reprend les trois routes, les permissions différenciées et les verdicts Harbor/SonarQube plutôt que de se limiter à un simple ping. Aucun finding relevé dans le diff ; la bascule nginx reste explicitement portée par la MR empilée #2776.

… type block Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I6b3e511e25e17db048f94a7cb31bdbb56a6a6964

…ession Remove the parallel monitor() probe paths: Harbor and SonarQube expose a single check() that probes the legacy monitor endpoint and reports the verdict directly with indicator.up()/down(), carrying message and cause as indicator data. fromHealthCheck lifts message and cause into the MonitorInfos shape, so every probe aggregates through the same check() path without MonitorStatus leaking into the health services. Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I746a21c6837dd2c448f192aec7d763ca6a6a6964

@Inject

Replace the private MonitoredService.lastStatus array and snapshot() with the module cache (CacheModule.register + @Inject(CACHE_MANAGER)), matching the registry and keycloak-secret-provider pattern. Reads fall back to the pending status until the first probe pass writes a key. Co-authored-by: Automata <automata@shikanime.studio>

Replace the hand-rolled setInterval timer (and its OnModuleDestroy cleanup) with @Cron(CronExpression.EVERY_5_MINUTES) on runAll, matching INTERVAL_MS; ScheduleModule.forRoot() is already global. onModuleInit keeps the first pass. Co-authored-by: Automata <automata@shikanime.studio>

The service now returns MonitorInfos.cause on every read; the public GET /health-services strips it in the controller, where the admin-only boundary lives. getCompleteServiceHealth and read(withCause) collapse into getServiceHealth; a cached status no longer merges over the pending fallback, so an OK entry never inherits the pending cause. Co-authored-by: Automata <automata@shikanime.studio>

The service returns the raw cached cause; toCause stringification now happens in toServiceHealth at the presentation layer, alongside the public-route stripping. fromHealthCheck stays in utils (probe parsing). Co-authored-by: Automata <automata@shikanime.studio>

toPublicServiceHealth replaces the inline destructure in health-services, keeping the admin-only cause rationale next to its siblings. Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio>

github-actions · 2026-10-13T09:22:51Z

🤖 Hey !

A preview of the application is available at : https://console-pr-2775.dso.cpin-hp.numerique-interieur.fr

Please be patient, deployment may take a few minutes.

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: If0057ad2b52eb20390f9f7649e26eb4c6a6a6964

The probe base64-encoded the token into a Bearer header — a Basic-auth payload under the Bearer scheme, which SonarQube rejects with 401, so the monitor reported UNKNOW on every pass. Send the raw token, matching sonarqube-http-client.service.ts. Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I3eb3aa5b70626b11321b2c40339b58916a6a6964

StephaneTrebel

La migration porte les trois routes, leurs permissions, les sondes conditionnelles et les verdicts Harbor/SonarQube, sans réintroduire les dépendances plugins retirées. Les checks de lint, tests, build, sécurité et Sonar sont verts sur cette tête ; le ledger global #1889 reste naturellement ouvert hors du périmètre de cette PR. Les deux threads nit existants (constante de message dupliquée et ordre d’import type) restent à traiter ou à clore explicitement, sans bloquer cette approbation.

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Icd0efdbd5cd254d3f6a0bf09a700527a6a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I22dfe4768465ef30ee92028dcb71a23a6a6a6964

Move CACHE_KEY to constants, MonitoredService and pendingStatus to utils, rename runAll to refreshStatuses, add a readStatus private method, validate the probe detail with a zod schema, and share REQUEST_ERROR_MESSAGE from service-monitor instead of redefining it in the sonarqube plugin. Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ibdc5ba2cb37552b8b3ef7030c2b4bccd6a6a6964

cloud-pi-native-sonarqube · 2026-10-15T19:44:19Z

Quality Gate passed

Issues

Measures

Project ID: cloud-pi-native_console_AYsa46O31ebDtzs-pYyZ

View in SonarQube

StephaneTrebel

La migration et ses tests sont présentes ; les contrôles CI sont verts et les anciens fils de revue sont résolus. Le ledger #2720 reste incomplet : la documentation demandée n’est pas livrée, et le fonctionnement en mode dev n’est pas établi par les éléments vérifiés ; ledger 2/4. Preuve du critère documentaire restant :

- [ ] La documentation liée a été ajoutée

shikanime requested a review from a team as a code owner September 24, 2026 10:24

This was referenced Sep 24, 2026

chore(nginx-strangler): route service-monitor to server-nestjs #2776

Open

refactor(service-monitor): migrate module from server #2488

Closed

github-actions Bot added the built label Sep 24, 2026

shikanime added this pull request to stack #2777 September 24, 2026 10:34

shikanime added the preview Deploy preview app with Argo-cd label Sep 24, 2026

StephaneTrebel reviewed Sep 24, 2026

View reviewed changes

Comment thread apps/server-nestjs/package.json

StephaneTrebel reviewed Sep 24, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/service-monitor/service-monitor.service.ts Outdated

StephaneTrebel approved these changes Sep 24, 2026

View reviewed changes

StephaneTrebel self-requested a review September 24, 2026 14:03

StephaneTrebel requested changes Sep 24, 2026

View reviewed changes

iliesmrf added this to the 9.27.0 milestone Sep 25, 2026

shikanime removed the preview Deploy preview app with Argo-cd label Sep 28, 2026

shikanime self-assigned this Sep 29, 2026

shikanime added the refactor Refactor code label Sep 29, 2026

shikanime requested review from a team and StephaneTrebel and removed request for StephaneTrebel September 29, 2026 13:07

shikanime commented Sep 30, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/service-monitor/service-monitor.utils.ts Outdated

Comment thread apps/server-nestjs/src/modules/service-monitor/service-monitor.service.ts Outdated

shikanime force-pushed the feat/service-monitor-nestjs branch 3 times, most recently from b1888a6 to 8b0c087 Compare October 1, 2026 15:15

iliesmrf modified the milestones: 9.27.0, 9.28.0 Oct 2, 2026

shikanime force-pushed the feat/service-monitor-nestjs branch from 43fbc77 to a0fbda4 Compare October 2, 2026 11:56

StephaneTrebel approved these changes Oct 2, 2026

View reviewed changes

shikanime commented Oct 7, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/sonarqube/sonarqube.constants.ts Outdated

Comment thread apps/server-nestjs/src/modules/service-monitor/service-monitor.service.ts Outdated

shikanime force-pushed the feat/service-monitor-nestjs branch from 6d8d6f7 to aa67145 Compare October 8, 2026 12:25

shikanime linked an issue Oct 8, 2026 that may be closed by this pull request

💡 [REQUEST] - Migrer le module service-monitor vers server-nestjs #2720

Open

4 tasks

StephaneTrebel previously approved these changes Oct 9, 2026

View reviewed changes

refactor(service-monitor): move the ProbeOutcome type import into the…

ec0286f

… type block Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I6b3e511e25e17db048f94a7cb31bdbb56a6a6964

shikanime dismissed StephaneTrebel’s stale review via ec0286f October 12, 2026 13:42

shikanime force-pushed the feat/service-monitor-nestjs branch 2 times, most recently from cf237df to d124668 Compare October 12, 2026 14:20

shikanime force-pushed the feat/service-monitor-nestjs branch from d124668 to 8c355a5 Compare October 12, 2026 14:35

shikanime and others added 6 commits October 12, 2026 17:08

refactor(service-monitor): name the public-route cause stripping

bab4e6d

toPublicServiceHealth replaces the inline destructure in health-services, keeping the admin-only cause rationale next to its siblings. Co-authored-by: Automata <automata@shikanime.studio>

docs(service-monitor): compress the admin-only cause comment

313d496

Co-authored-by: Automata <automata@shikanime.studio>

shikanime added the preview Deploy preview app with Argo-cd label Oct 13, 2026

shikanime and others added 2 commits October 13, 2026 11:25

docs(service-monitor): drop the legacy cron narration comment

d820902

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: If0057ad2b52eb20390f9f7649e26eb4c6a6a6964

StephaneTrebel previously approved these changes Oct 13, 2026

View reviewed changes

refactor(service-monitor): move the health mappers to utils

916bea5

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Icd0efdbd5cd254d3f6a0bf09a700527a6a6a6964

shikanime dismissed StephaneTrebel’s stale review via 916bea5 October 14, 2026 13:43

shikanime commented Oct 15, 2026

View reviewed changes

shikanime added 2 commits October 15, 2026 17:31

refactor(sonarqube): validate the health body with zod

5231442

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I22dfe4768465ef30ee92028dcb71a23a6a6a6964

StephaneTrebel requested changes Oct 16, 2026

View reviewed changes

StephaneTrebel mentioned this pull request Oct 17, 2026

[NestJS] Modularisation de server #1889

Open

4 tasks

Conversation

shikanime commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issues liées

Quel est le comportement actuel ?

Quel est le nouveau comportement ?

Cette PR introduit-elle un breaking change ?

Autres informations

Uh oh!

github-actions Bot commented Sep 24, 2026

Uh oh!

Uh oh!

Uh oh!

StephaneTrebel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shikanime commented Sep 25, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shikanime left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

StephaneTrebel left a comment

Choose a reason for hiding this comment

Uh oh!

shikanime left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

StephaneTrebel left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Oct 13, 2026

Uh oh!

StephaneTrebel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cloud-pi-native-sonarqube Bot commented Oct 15, 2026

Quality Gate passed

Issues

Measures

Uh oh!

StephaneTrebel left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shikanime commented Sep 24, 2026 •

edited

Loading