修复延迟问题
This commit is contained in:
@@ -910,13 +910,12 @@ app.put('/api/latency-routes/:id', requireAuth, async (req, res) => {
|
||||
app.get('/api/metrics/latency', async (req, res) => {
|
||||
try {
|
||||
const [routes] = await db.query(`
|
||||
SELECT r.*, s.url
|
||||
SELECT r.*, s.url, s.type as source_type
|
||||
FROM latency_routes r
|
||||
JOIN prometheus_sources s ON r.source_id = s.id
|
||||
`);
|
||||
|
||||
if (routes.length === 0) {
|
||||
// Return empty routes array instead of null for consistency
|
||||
return res.json({ routes: [] });
|
||||
}
|
||||
|
||||
@@ -924,8 +923,8 @@ app.get('/api/metrics/latency', async (req, res) => {
|
||||
// Try to get from Valkey first (filled by background latencyService)
|
||||
let latency = await cache.get(`latency:route:${route.id}`);
|
||||
|
||||
// Fallback if not in cache (maybe service just started or failed)
|
||||
if (latency === null) {
|
||||
// Fallback if not in cache (only for prometheus sources, blackbox sources rely on the background service)
|
||||
if (latency === null && route.source_type === 'prometheus') {
|
||||
latency = await prometheusService.getLatency(route.url, route.latency_target);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,8 @@ async function pollLatency() {
|
||||
const lines = response.data.split('\n');
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.match(/^probe_success\s+1/)) {
|
||||
// Match probe_success with optional labels: probe_success{...} 1
|
||||
if (line.match(/^probe_success({.*})?\s+1/)) {
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
@@ -48,8 +49,9 @@ async function pollLatency() {
|
||||
// Try specialized metrics first for better accuracy
|
||||
const priorityMetrics = ['probe_icmp_duration_seconds', 'probe_http_duration_seconds', 'probe_duration_seconds'];
|
||||
for (const metricName of priorityMetrics) {
|
||||
// Support scientific notation (e.g. 1.23e-04)
|
||||
const regex = new RegExp(`^${metricName}(?:\\{.*\\})?\\s+([\\d.eE+-]+)`);
|
||||
// More robust regex: handle optional labels and scientific notation
|
||||
// Supports: metric_name{...} 1.23e-4 or metric_name 0.05
|
||||
const regex = new RegExp(`^${metricName}\\s*(?:\\{[^}]*\\})?\\s+([\\d.eE+-]+)`);
|
||||
for (const line of lines) {
|
||||
const match = line.match(regex);
|
||||
if (match) {
|
||||
|
||||
Reference in New Issue
Block a user