Skip to content

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

Open
shikanime wants to merge 1 commit into
feat/service-monitor-nestjsfrom
feat/service-monitor-nginx
Open

feat(nginx-strangler): route service-monitor to server-nestjs#2776
shikanime wants to merge 1 commit into
feat/service-monitor-nestjsfrom
feat/service-monitor-nginx

Conversation

@shikanime

@shikanime shikanime commented Sep 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Issues liées

Refs #1889

Quel est le comportement actuel ?

Les routes GET /api/v1/health-services, GET /api/v1/complete-services et GET /api/v1/refresh-services sont encore routées vers le legacy apps/server par apps/nginx-strangler.

Quel est le nouveau comportement ?

Bascule nginx-strangler des trois routes vers server-nestjs :

  • location = /api/v1/health-services, location = /api/v1/complete-services, location = /api/v1/refresh-services — correspondances exactes, même gabarit que les bascules healthz et version.
  • Placées dans la section Routes migrées vers NestJS, avant la section Routes par défaut (pour l'instant dans le legacy).
  • Dépend du module service-monitor migré dans refactor(service-monitor): migrate module from server #2775 : à fusionner après celle-ci.

Cette PR introduit-elle un breaking change ?

Non.

Autres informations

Rollback : commenter le bloc location concerné puis docker compose exec nginx-strangler nginx -s reload, conformément à la procédure en tête de routing.conf.

@shikanime
shikanime requested a review from a team as a code owner September 24, 2026 10:24
This was referenced Sep 24, 2026
Open
Closed
@github-actions github-actions Bot added the built label Sep 24, 2026
@shikanime
shikanime added this pull request to stack #2777 September 24, 2026 10:34
@shikanime shikanime added the preview Deploy preview app with Argo-cd label Sep 24, 2026
@github-actions

github-actions Bot commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

🤖 Hey !

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

Please be patient, deployment may take a few minutes.

StephaneTrebel
StephaneTrebel previously approved these changes Sep 24, 2026
View reviewed changes
@iliesmrf iliesmrf added this to the 9.27.0 milestone Sep 25, 2026
@StephaneTrebel
StephaneTrebel self-requested a review September 25, 2026 12:37
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 0641e13 to 4c8cc74 Compare September 25, 2026 12:59
@shikanime

shikanime commented Sep 25, 2026

Copy link
Copy Markdown
Member Author

PR réduite à la bascule nginx.

Le câblage AuthModule de ServiceMonitorModule a été déplacé vers #2775.

Diff actuel : apps/nginx-strangler/conf.d/routing.conf uniquement.

StephaneTrebel
StephaneTrebel previously approved these changes Sep 25, 2026
View reviewed changes
@shikanime shikanime removed the preview Deploy preview app with Argo-cd label Sep 28, 2026
@shikanime shikanime moved this to Backlog in Cloud Pi Native Sep 29, 2026
@shikanime shikanime moved this from Ready to In review in Cloud Pi Native Sep 29, 2026
@shikanime shikanime added the enhancement New feature or request label Sep 29, 2026
@shikanime shikanime self-assigned this Sep 29, 2026
@shikanime
shikanime requested review from a team and StephaneTrebel and removed request for StephaneTrebel September 29, 2026 11:13
StephaneTrebel
StephaneTrebel previously approved these changes Sep 30, 2026
View reviewed changes
@shikanime
shikanime dismissed StephaneTrebel’s stale review October 1, 2026 14:49

The merge-base changed after approval.

@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch 2 times, most recently from a718b30 to f146d2c Compare October 2, 2026 08:17
@iliesmrf iliesmrf modified the milestones: 9.27.0, 9.28.0 Oct 2, 2026
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from f146d2c to 15b8e80 Compare October 2, 2026 11:56
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 15b8e80 to 51ae4de Compare October 2, 2026 12:16
StephaneTrebel
StephaneTrebel previously approved these changes Oct 2, 2026
View reviewed changes

@StephaneTrebel StephaneTrebel left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approbation : la bascule service-monitor vise le module précédemment revu, avec les tests de payload et d’initialisation ajoutés. Fils résolus et CI verte.

@shikanime
shikanime dismissed StephaneTrebel’s stale review October 2, 2026 14:58

The merge-base changed after approval.

@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch 2 times, most recently from 4dfd31c to ab0e57a Compare October 2, 2026 15:09
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from ab0e57a to 18682f7 Compare October 2, 2026 15:21
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 18682f7 to 0534345 Compare October 2, 2026 15:24
StephaneTrebel
StephaneTrebel previously requested changes Oct 5, 2026
View reviewed changes

@StephaneTrebel StephaneTrebel left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocking: GitHub signale un conflit de fusion concret (, ), qui empêche l’intégration de cette MR. Les conflits doivent être résolus et la CI relancée avant validation.

@StephaneTrebel
StephaneTrebel dismissed their stale review October 5, 2026 07:33

Revue remplacée : le shell a supprimé les valeurs entre accents graves du verdict.

StephaneTrebel
StephaneTrebel requested changes Oct 5, 2026
View reviewed changes

@StephaneTrebel StephaneTrebel left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocking: GitHub signale un conflit de fusion concret (mergeable=CONFLICTING, mergeStateStatus=DIRTY), qui empêche l’intégration de cette MR. Les conflits doivent être résolus et la CI relancée avant validation.

@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 0534345 to 2584bce Compare October 7, 2026 15:00
shikanime
shikanime commented Oct 7, 2026
View reviewed changes

@shikanime shikanime left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revue du head 2584bce7 (empilé sur #2775). Les trois location = exactes (health-services, complete-services, refresh-services) reprennent le gabarit des bascules healthz/version, placées avant la section legacy — correspondance exacte correcte ici, ce sont des routes terminales sans sous-chemin. Le corps documente dépendance #2775, procédure de rollback, et Refs #1889. Le seul contenu hors périmètre nginx est le réordonnancement de l'import ProbeOutcome dans service-monitor.service.ts (fix d'ordre d'import, sans effet fonctionnel). Rien de bloquant.

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

Comment thread apps/server-nestjs/src/modules/service-monitor/service-monitor.service.ts
@@ -1,5 +1,6 @@
import type { MonitorInfos } from '@cpn-console/shared'
import type { OnModuleDestroy, OnModuleInit } from '@nestjs/common'
import type { ProbeOutcome } from './service-monitor.utils'

@shikanime shikanime Oct 7, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit — Ce réordonnancement d'import (ProbeOutcome remonté avant l'import de valeurs) est un fix de style sans lien avec le bascule nginx ; il appartient à #2775 (le fichier y est créé). Le garder ici mélange « cutover config » et retouche de la PR empilée — à squash dans #2775 avant fusion.

Comment thread apps/nginx-strangler/conf.d/routing.conf
proxy_set_header X-Forwarded-Proto $scheme;
}

location = /api/v1/health-services {

@shikanime shikanime Oct 7, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit — Type de titre : cette PR de bascule est feat(nginx-strangler) alors que sa sœur #2756 (/api/v1/clusters) est chore(nginx-strangler). Les deux sont du routage de bascule, pas une fonctionnalité ; harmoniser sur chore pour que le changelog release-please ne présente pas un flip nginx comme un feat.

@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 2584bce to 0882b0b Compare October 8, 2026 12:25
@shikanime
feat(nginx-strangler): route service-monitor to server-nestjs
7454b86 
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I93e50d0451443a8cdd0d420121e028d26a6a6964

Signed-off-by: Shikanime Deva <22115108+shikanime@users.noreply.github.com>
@shikanime
shikanime force-pushed the feat/service-monitor-nginx branch from 0882b0b to 7454b86 Compare October 8, 2026 12:41
@cloud-pi-native-sonarqube

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

Copy link
Copy Markdown

Passed Quality Gate passed

Issues

Measures

Project ID: cloud-pi-native_console_AYsa46O31ebDtzs-pYyZ

View in SonarQube

@shikanime 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@StephaneTrebel StephaneTrebel StephaneTrebel requested changes

Requested changes must be addressed to merge this pull request.

Assignees

@shikanime shikanime

Labels

built enhancement New feature or request

Projects

None yet

Milestone

9.28.0

Development

Successfully merging this pull request may close these issues.

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

3 participants

@shikanime @StephaneTrebel @iliesmrf