deployer3000
/
trust-module-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Added the start, end, and step parameters to solve the update issue on the charts.

pull/12/head
DmitriyA 2025-04-08 01:58:15 -04:00
parent 553b9141d4
commit 23d2fd7eff
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/metrics.gateway.ts
View File

@ -35,22 +35,28 @@ export class MetricsGateway implements OnGatewayInit, OnGatewayConnection, OnGat
}
@SubscribeMessage('get-metrics')
async handleGetMetrics(client: Socket, payload: any) {
const { metric, start, end, step } = payload;
async handleGetMetrics(client: Socket, payload: any) {
const { metric, start, end, step, _t } = payload;
this.logger.log(`Received metrics request: ${metric}, start: ${start}, end: ${end}, step: ${step}`);
try {
const data = start && end && step
? await this.prometheusService.fetchMetricsRange(metric, start, end, step)
: await this.prometheusService.fetchMetrics(metric);
// Для запросов с диапазоном - просто возвращаем данные без подписки
if (start && end) {
const data = await this.prometheusService.fetchMetricsRange(metric, start, end, step);
client.emit('metrics-data', { metric, data });
return;
}
// Запускаем автоматические обновления с интервалом по умолчанию
// Для запросов без диапазона (realtime) - запускаем подписку
const stopUpdates = await this.sendPeriodicUpdates(
metric,
5000, // Интервал по умолчанию
step || 5000, // Используем переданный шаг или дефолтный
client
);
client.on('disconnect', () => stopUpdates());
client.on('unsubscribe-metric', () => stopUpdates());
} catch (error) {
this.logger.error(`Error fetching metrics: ${error.message}`);
client.emit('metrics-error', {
@ -58,7 +64,7 @@ async handleGetMetrics(client: Socket, payload: any) {
error: error.message
});
}
}
}
@SubscribeMessage('get-metric-types')
async handleGetMetricTypes(client: Socket, payload: { metric: string }) {
@ -95,7 +101,7 @@ async handleGetMetrics(client: Socket, payload: any) {
@SubscribeMessage('subscribe-metric')
async handleSubscribeMetric(client: Socket, payload: { metric: string, interval?: number }) {
async handleSubscribeMetric(client: Socket, payload: { metric: string, interval?: number }) {
const stopUpdates = await this.sendPeriodicUpdates(
payload.metric,
payload.interval || 5000, // Добавляем значение по умолчанию
@ -105,7 +111,7 @@ async handleSubscribeMetric(client: Socket, payload: { metric: string, interval?
// Сохраняем функцию остановки для этого клиента
client.on('disconnect', () => stopUpdates());
client.on('unsubscribe-metric', () => stopUpdates());
}
}
// Метод для периодической отправки обновлений
async sendPeriodicUpdates(metric: string, interval: number, client: Socket) {