diff --git a/src/app/api/report/route.ts b/src/app/api/report/route.ts index f4dd91a..d319ae4 100644 --- a/src/app/api/report/route.ts +++ b/src/app/api/report/route.ts @@ -7,11 +7,11 @@ function parseValues(values: [number, string][]): DataPoint[] { return values.map(([ts, val]) => ({ timestamp: ts, value: parseFloat(val) })); } -function processResults(results: { metric: Record; values: [number, string][] }[]) { +function processResults(results: { metric: Record; values: [number, string][] }[], labelKey?: string) { return results.map((r) => { const dataPoints = parseValues(r.values); return { - instance: r.metric.node || r.metric.instance || '', + instance: labelKey ? (r.metric[labelKey] || '') : (r.metric.node || r.metric.instance || ''), metric: r.metric, dataPoints, stats: calculateStats(dataPoints), @@ -63,7 +63,7 @@ export async function GET(request: NextRequest) { cpu: processResults(cpuData), memory: processResults(memData), disk: processResults(diskData), - nas: processResults(nasData), + nas: processResults(nasData, 'mountpoint'), ingress: { receive: processResults(ingressRxData), transmit: processResults(ingressTxData),