Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shikanime wants to merge 1 commit into from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions apps/nginx-strangler/conf.d/routing.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,33 @@ server {
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.

proxy_pass http://server-nestjs;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location = /api/v1/complete-services {
proxy_pass http://server-nestjs;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location = /api/v1/refresh-services {
proxy_pass http://server-nestjs;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

# ── Routes par défaut (pour l'instant dans le legacy) ─────────────────────────
location /api/ {
proxy_pass http://server-legacy;
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/service-monitor/service-monitor.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

import { MonitorStatus } from '@cpn-console/shared'
import { Inject, Injectable, Optional } from '@nestjs/common'
import { ArgoCDHealthService } from '../argocd/argocd-health.service'
Expand All @@ -11,7 +12,6 @@ import { SonarqubeHealthService } from '../sonarqube/sonarqube-health.service'
import { VaultHealthService } from '../vault/vault-health.service'
import { INTERVAL_MS, PENDING_MESSAGE, REQUEST_ERROR_MESSAGE } from './service-monitor.constants'
import { fromHealthCheck, toCause } from './service-monitor.utils'
import type { ProbeOutcome } from './service-monitor.utils'

export type ServiceHealth = MonitorInfos & { name: string }

Expand Down
Loading