-
Notifications
You must be signed in to change notification settings - Fork 235
feat(admin): add Prometheus-backed /admin/metrics SSE endpoint #662
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.
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
Ferryx349
wants to merge
3
commits into
cameri:main
Choose a base branch
from
Ferryx349:ADMIN-CONSOLE-2-SSE
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "nostream": minor | ||
| --- | ||
|
|
||
| feat: add Prometheus-backed admin metrics SSE endpoint |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { Request, Response } from 'express' | ||
|
|
||
| import { IController } from '../../@types/controllers' | ||
| import { createLogger } from '../../factories/logger-factory' | ||
| import { collectAdminMetricsSnapshot, getAdminMetricsSseIntervalMs } from '../../utils/admin-metrics' | ||
|
|
||
| const logger = createLogger('get-admin-metrics-controller') | ||
|
|
||
| export class GetAdminMetricsController implements IController { | ||
| public async handleRequest(request: Request, response: Response): Promise<void> { | ||
| response.status(200) | ||
| response.setHeader('content-type', 'text/event-stream; charset=utf-8') | ||
| response.setHeader('cache-control', 'no-cache, no-transform') | ||
| response.setHeader('connection', 'keep-alive') | ||
| response.flushHeaders() | ||
|
|
||
| let closed = false | ||
| let inFlight = false | ||
| let timer: ReturnType<typeof setInterval> | undefined | ||
|
|
||
| const cleanup = () => { | ||
| closed = true | ||
| if (timer) { | ||
| clearInterval(timer) | ||
| timer = undefined | ||
| } | ||
| } | ||
|
|
||
| request.on('close', cleanup) | ||
|
|
||
| const sendSnapshot = async () => { | ||
| if (closed || response.writableEnded || inFlight) { | ||
| return | ||
| } | ||
|
|
||
| inFlight = true | ||
|
|
||
| try { | ||
| const snapshot = await collectAdminMetricsSnapshot() | ||
| if (closed || response.writableEnded) { | ||
| return | ||
| } | ||
|
|
||
| response.write(`data: ${JSON.stringify(snapshot)}\n\n`) | ||
| } catch (error) { | ||
| logger.warn('failed to collect admin metrics snapshot: %o', error) | ||
| if (!closed && !response.writableEnded) { | ||
| response.write(`event: error\ndata: ${JSON.stringify({ error: 'failed to collect metrics' })}\n\n`) | ||
| } | ||
| } finally { | ||
| inFlight = false | ||
| } | ||
| } | ||
|
|
||
| await sendSnapshot() | ||
|
|
||
| if (closed || response.writableEnded) { | ||
| return | ||
| } | ||
|
|
||
| const intervalMs = getAdminMetricsSseIntervalMs() | ||
| timer = setInterval(() => { | ||
| void sendSnapshot() | ||
| }, intervalMs) | ||
| } | ||
| } | ||
6 changes: 6 additions & 0 deletions
6
src/factories/controllers/get-admin-metrics-controller-factory.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { GetAdminMetricsController } from '../../controllers/admin/get-metrics-controller' | ||
| import { IController } from '../../@types/controllers' | ||
|
|
||
| export const createGetAdminMetricsController = (): IController => { | ||
| return new GetAdminMetricsController() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| import { AdminDependencyHealth, collectAdminHealthSnapshot } from './admin-health' | ||
| import { queryPrometheusInstant } from './prometheus-client' | ||
|
|
||
| export interface AdminMetricsValues { | ||
| eventsPerSecond: number | ||
| eventsRejectedPerSecond: number | ||
| eventsAcceptedTotal: number | ||
| eventsRejectedTotal: number | ||
| activeConnections: number | ||
| cpuLoadPercent: number | ||
| memoryUsedMb: number | ||
| } | ||
|
|
||
| export interface AdminMetricsSnapshot { | ||
| timestamp: number | ||
| status: 'ok' | 'degraded' | 'unavailable' | ||
| metrics: AdminMetricsValues | ||
| health: { | ||
| database: AdminDependencyHealth | ||
| redis: AdminDependencyHealth | ||
| } | ||
| prometheus: { | ||
| available: boolean | ||
| error?: string | ||
| } | ||
| } | ||
|
|
||
| const PROMQL = { | ||
| eventsAcceptedRate: 'sum(rate(nostream_events_accepted_total[1m]))', | ||
| eventsRejectedRate: 'sum(rate(nostream_events_rejected_total[1m]))', | ||
| eventsAcceptedTotal: 'sum(nostream_events_accepted_total)', | ||
| eventsRejectedTotal: 'sum(nostream_events_rejected_total)', | ||
| activeConnections: 'sum(nostream_websocket_connections)', | ||
| cpuLoadPercent: 'avg(nostream_process_cpu_load_percent)', | ||
| memoryUsedMb: 'sum(nostream_process_memory_used_mb)', | ||
| } as const | ||
|
|
||
| const toMetricValue = (value: number | undefined): number => { | ||
| return value ?? 0 | ||
| } | ||
|
|
||
| let cachedSnapshot: AdminMetricsSnapshot | undefined | ||
| let cachedAt = 0 | ||
| let snapshotInFlight: Promise<AdminMetricsSnapshot> | undefined | ||
|
|
||
| export const resetAdminMetricsSnapshotCache = (): void => { | ||
| cachedSnapshot = undefined | ||
| cachedAt = 0 | ||
| snapshotInFlight = undefined | ||
| } | ||
|
|
||
| const collectAdminMetricsSnapshotUncached = async (): Promise<AdminMetricsSnapshot> => { | ||
| const [ | ||
| health, | ||
| eventsAcceptedRate, | ||
| eventsRejectedRate, | ||
| eventsAcceptedTotal, | ||
| eventsRejectedTotal, | ||
| activeConnections, | ||
| cpuLoadPercent, | ||
| memoryUsedMb, | ||
| ] = await Promise.all([ | ||
| collectAdminHealthSnapshot(), | ||
| queryPrometheusInstant(PROMQL.eventsAcceptedRate), | ||
| queryPrometheusInstant(PROMQL.eventsRejectedRate), | ||
| queryPrometheusInstant(PROMQL.eventsAcceptedTotal), | ||
| queryPrometheusInstant(PROMQL.eventsRejectedTotal), | ||
| queryPrometheusInstant(PROMQL.activeConnections), | ||
| queryPrometheusInstant(PROMQL.cpuLoadPercent), | ||
| queryPrometheusInstant(PROMQL.memoryUsedMb), | ||
| ]) | ||
|
|
||
| const prometheusAvailable = | ||
| eventsAcceptedRate !== undefined || | ||
| eventsRejectedRate !== undefined || | ||
| eventsAcceptedTotal !== undefined || | ||
| eventsRejectedTotal !== undefined || | ||
| activeConnections !== undefined || | ||
| cpuLoadPercent !== undefined || | ||
| memoryUsedMb !== undefined | ||
|
|
||
| const metricsHealthy = health.database.ok && health.redis.ok | ||
| let status: AdminMetricsSnapshot['status'] = 'ok' | ||
|
|
||
| if (!prometheusAvailable) { | ||
| status = 'unavailable' | ||
| } else if (!metricsHealthy) { | ||
| status = 'degraded' | ||
| } | ||
|
|
||
| return { | ||
| timestamp: Date.now(), | ||
| status, | ||
| metrics: { | ||
| eventsPerSecond: toMetricValue(eventsAcceptedRate), | ||
| eventsRejectedPerSecond: toMetricValue(eventsRejectedRate), | ||
| eventsAcceptedTotal: toMetricValue(eventsAcceptedTotal), | ||
| eventsRejectedTotal: toMetricValue(eventsRejectedTotal), | ||
| activeConnections: toMetricValue(activeConnections), | ||
| cpuLoadPercent: toMetricValue(cpuLoadPercent), | ||
| memoryUsedMb: toMetricValue(memoryUsedMb), | ||
| }, | ||
| health: { | ||
| database: health.database, | ||
| redis: health.redis, | ||
| }, | ||
| prometheus: { | ||
| available: prometheusAvailable, | ||
| ...(prometheusAvailable ? {} : { error: 'Prometheus query returned no data' }), | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| export const collectAdminMetricsSnapshot = async (): Promise<AdminMetricsSnapshot> => { | ||
| const cacheTtlMs = getAdminMetricsSseIntervalMs() | ||
| const now = Date.now() | ||
|
|
||
| if (cachedSnapshot && now - cachedAt < cacheTtlMs) { | ||
| return cachedSnapshot | ||
| } | ||
|
|
||
| if (snapshotInFlight) { | ||
| return snapshotInFlight | ||
| } | ||
|
|
||
| snapshotInFlight = collectAdminMetricsSnapshotUncached() | ||
| .then((snapshot) => { | ||
| cachedSnapshot = snapshot | ||
| cachedAt = Date.now() | ||
| return snapshot | ||
| }) | ||
| .finally(() => { | ||
| snapshotInFlight = undefined | ||
| }) | ||
|
|
||
| return snapshotInFlight | ||
| } | ||
|
|
||
| export const getAdminMetricsSseIntervalMs = (): number => { | ||
| const intervalCandidate = Number(process.env.ADMIN_METRICS_SSE_INTERVAL_MS || 5000) | ||
|
|
||
| if (!Number.isFinite(intervalCandidate) || intervalCandidate < 1000) { | ||
| return 5000 | ||
| } | ||
|
|
||
| return intervalCandidate | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import axios from 'axios' | ||
|
|
||
| import { createLogger } from '../factories/logger-factory' | ||
|
|
||
| const logger = createLogger('prometheus-client') | ||
|
|
||
| const DEFAULT_PROMETHEUS_URL = 'http://127.0.0.1:9090' | ||
|
|
||
| interface PrometheusInstantQueryResponse { | ||
| status: 'success' | 'error' | ||
| data?: { | ||
| resultType: 'vector' | 'scalar' | string | ||
| result: | ||
| | Array<{ | ||
| value?: [number, string] | ||
| }> | ||
| | [number, string] | ||
| } | ||
| error?: string | ||
| errorType?: string | ||
| } | ||
|
|
||
| export const getPrometheusBaseUrl = (): string => { | ||
| const configured = process.env.PROMETHEUS_URL?.trim() | ||
| if (!configured) { | ||
| return DEFAULT_PROMETHEUS_URL | ||
| } | ||
|
|
||
| return configured.replace(/\/+$/, '') | ||
| } | ||
|
|
||
| export const parsePrometheusInstantQueryScalar = (response: PrometheusInstantQueryResponse): number | undefined => { | ||
| if (response.status !== 'success') { | ||
| return undefined | ||
| } | ||
|
|
||
| const data = response.data | ||
| let rawValue: string | undefined | ||
|
|
||
| if (data?.resultType === 'scalar' && Array.isArray(data.result) && data.result.length >= 2) { | ||
| rawValue = String(data.result[1]) | ||
| } else if (Array.isArray(data?.result)) { | ||
| const vectorResult = data.result as Array<{ value?: [number, string] }> | ||
| rawValue = vectorResult[0]?.value?.[1] | ||
| } | ||
|
|
||
| if (rawValue === undefined) { | ||
| return undefined | ||
| } | ||
|
|
||
| const parsed = Number(rawValue) | ||
| return Number.isFinite(parsed) ? parsed : undefined | ||
| } | ||
|
|
||
| export const queryPrometheusInstant = async (query: string): Promise<number | undefined> => { | ||
| const baseUrl = getPrometheusBaseUrl() | ||
|
|
||
| try { | ||
| const timeoutCandidate = Number(process.env.PROMETHEUS_QUERY_TIMEOUT_MS) | ||
| const timeoutMs = Number.isFinite(timeoutCandidate) && timeoutCandidate > 0 ? timeoutCandidate : 5000 | ||
|
|
||
| const response = await axios.get<PrometheusInstantQueryResponse>(`${baseUrl}/api/v1/query`, { | ||
| params: { query }, | ||
| timeout: timeoutMs, | ||
| validateStatus: () => true, | ||
| }) | ||
|
|
||
| if (response.status !== 200) { | ||
| logger.warn('prometheus query failed with HTTP %d: %s', response.status, query) | ||
| return undefined | ||
| } | ||
|
|
||
| if (response.data.status !== 'success') { | ||
| logger.warn('prometheus query error for %s: %s', query, response.data.error ?? response.data.errorType ?? 'unknown') | ||
| return undefined | ||
| } | ||
|
|
||
| return parsePrometheusInstantQueryScalar(response.data) | ||
| } catch (error) { | ||
| logger.warn('prometheus query request failed for %s: %o', query, error) | ||
| return undefined | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.