feat(dashboard): 首页请求趋势拆分状态码并合并容量到业务流量

- 24 小时请求趋势拆分展示请求总量与 200/400/500 状态码请求量,独占一行;
  时间桶聚合新增 status_200/400/500_count(CH countIf、PG FILTER),
  请求趋势改为基于原始桶聚合(小时 rollup 无状态码口径)
- 首页移除宿主机磁盘指标,容量趋势(CPU/内存)并入业务流量卡片展示
- 压缩协议 traffic_24h 扩展为 7 元组,前端归一化同步更新
This commit is contained in:
ryan
2026-08-13 10:57:21 +08:00
parent a9e4237bbf
commit a4dd5ca9e1
15 changed files with 196 additions and 160 deletions
@@ -3,39 +3,29 @@
import { TrendChart } from '@/components/data/trend-chart';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import type {
DiskIOTrendPoint,
CapacityTrendPoint,
NetworkTrendPoint,
} from '@/lib/services/openflare';
import {
formatBytes,
formatBytesPerSecond,
formatPercent,
formatTrendHour,
} from './dashboard-utils';
/** Backend disk points are per-hour totals; chart displays bytes/s within each hour. */
const DISK_BUCKET_SECONDS = 3600;
function diskBytesToRate(bytes: number) {
return bytes > 0 ? bytes / DISK_BUCKET_SECONDS : 0;
}
function formatDiskRate(bytesPerSecond: number) {
return formatBytesPerSecond(bytesPerSecond, 1, { zeroText: '0 B' });
}
export function NetworkDiskTrendChart({
/** 业务流量(来自访问日志)与容量趋势(节点 Agent 宿主机指标)合并展示。 */
export function TrafficCapacityTrendChart({
networkPoints,
diskPoints,
capacityPoints,
}: {
networkPoints: NetworkTrendPoint[];
diskPoints: DiskIOTrendPoint[];
capacityPoints: CapacityTrendPoint[];
}) {
return (
<Card className='border-dashed shadow-none'>
<CardHeader>
<CardTitle className='text-sm font-semibold'>
24 小时业务流量与宿主机磁盘
24 小时业务流量与容量趋势
</CardTitle>
</CardHeader>
<CardContent className='space-y-6'>
@@ -66,31 +56,31 @@ export function NetworkDiskTrendChart({
/>
<TrendChart
labels={diskPoints.map((point) =>
labels={capacityPoints.map((point) =>
formatTrendHour(point.bucket_started_at),
)}
height={180}
summaryScope='average'
summaryHint='近 24 小时 · 宿主机磁盘 · 平均速率'
yAxisValueFormatter={formatDiskRate}
summaryHint='近 24 小时 · 宿主机容量 · 平均值'
yAxisValueFormatter={formatPercent}
series={[
{
label: '磁盘读',
color: '#a78bfa',
fillColor: 'rgba(167, 139, 250, 0.14)',
label: '平均 CPU',
color: '#0f766e',
fillColor: 'rgba(15, 118, 110, 0.15)',
variant: 'area',
values: diskPoints.map((point) =>
diskBytesToRate(point.disk_read_bytes),
values: capacityPoints.map(
(point) => point.average_cpu_usage_percent,
),
valueFormatter: formatDiskRate,
valueFormatter: formatPercent,
},
{
label: '磁盘写',
color: '#fb7185',
values: diskPoints.map((point) =>
diskBytesToRate(point.disk_write_bytes),
label: '平均内存',
color: '#2563eb',
values: capacityPoints.map(
(point) => point.average_memory_usage_percent,
),
valueFormatter: formatDiskRate,
valueFormatter: formatPercent,
},
]}
/>
@@ -15,7 +15,7 @@ import { formatTrendHour } from './dashboard-utils';
export function TrafficTrendChart({
points,
title = '24 小时请求趋势',
description = '观察整体请求量和错误量是否出现异常抬升。',
description = '按小时拆分请求总量与 2xx/4xx/5xx 状态码请求量,判断各状态是否异常抬升。',
}: {
points: TrafficTrendPoint[];
title?: string;
@@ -43,9 +43,19 @@ export function TrafficTrendChart({
values: points.map((point) => point.request_count),
},
{
label: '错误量',
label: '2xx 请求',
color: '#22c55e',
values: points.map((point) => point.status_2xx_count),
},
{
label: '4xx 请求',
color: '#f97316',
values: points.map((point) => point.status_4xx_count),
},
{
label: '5xx 请求',
color: '#ef4444',
values: points.map((point) => point.error_count),
values: points.map((point) => point.status_5xx_count),
},
]}
/>
+98 -100
View File
@@ -1,114 +1,112 @@
'use client';
import { useQuery } from '@tanstack/react-query';
import { LayoutDashboard, RefreshCw } from 'lucide-react';
import {useQuery} from '@tanstack/react-query';
import {LayoutDashboard, RefreshCw} from 'lucide-react';
import { EmptyStateWithBorder } from '@/components/layout/empty';
import { ErrorInline } from '@/components/layout/error';
import { LoadingStateWithBorder } from '@/components/layout/loading';
import { Button } from '@/components/ui/button';
import { DashboardService } from '@/lib/services/openflare';
import { formatDateTime } from '@/lib/utils';
import {EmptyStateWithBorder} from '@/components/layout/empty';
import {ErrorInline} from '@/components/layout/error';
import {LoadingStateWithBorder} from '@/components/layout/loading';
import {Button} from '@/components/ui/button';
import {DashboardService} from '@/lib/services/openflare';
import {formatDateTime} from '@/lib/utils';
import { CapacityTrendChart } from './components/dashboard/capacity-trend-chart';
import {
SourceDistributionChart,
StatusCodeDistributionChart,
TopDomainChart,
SourceDistributionChart,
StatusCodeDistributionChart,
TopDomainChart,
} from './components/dashboard/distribution-rank-charts';
import { NetworkDiskTrendChart } from './components/dashboard/network-disk-trend-chart';
import { NodeHealthTable } from './components/dashboard/node-health-table';
import { TrafficTrendChart } from './components/dashboard/traffic-trend-chart';
import { WorldStage } from './components/dashboard/world-stage';
import { getErrorMessage } from './nodes/components/node-utils';
import {NodeHealthTable} from './components/dashboard/node-health-table';
import {TrafficCapacityTrendChart} from './components/dashboard/traffic-capacity-trend-chart';
import {TrafficTrendChart} from './components/dashboard/traffic-trend-chart';
import {WorldStage} from './components/dashboard/world-stage';
import {getErrorMessage} from './nodes/components/node-utils';
const dashboardQueryKey = ['openflare', 'dashboard', 'overview'];
export default function OpenFlareDashboardPage() {
const overviewQuery = useQuery({
queryKey: dashboardQueryKey,
queryFn: () => DashboardService.getOverview(),
refetchInterval: 60_000,
});
const overviewQuery = useQuery({
queryKey: dashboardQueryKey,
queryFn: () => DashboardService.getOverview(),
refetchInterval: 60_000,
});
const overview = overviewQuery.data;
const overview = overviewQuery.data;
return (
<div className='py-6 px-1 space-y-6'>
<div className='flex flex-wrap items-center justify-between gap-3'>
<div className='flex items-center gap-2'>
<LayoutDashboard className='size-5 text-primary' />
<h1 className='text-2xl font-semibold tracking-tight'>总览</h1>
return (
<div className='py-6 px-1 space-y-6'>
<div className='flex flex-wrap items-center justify-between gap-3'>
<div className='flex items-center gap-2'>
<LayoutDashboard className='size-5 text-primary'/>
<h1 className='text-2xl font-semibold tracking-tight'>总览</h1>
</div>
<div className='flex items-center gap-2 text-xs text-muted-foreground'>
{overview?.generated_at ? (
<span>数据生成于 {formatDateTime(overview.generated_at)}</span>
) : null}
<Button
variant='outline'
size='sm'
className='h-8'
onClick={() => overviewQuery.refetch()}
disabled={overviewQuery.isFetching}
>
<RefreshCw
className={`size-3.5 mr-1.5 ${overviewQuery.isFetching ? 'animate-spin' : ''}`}
/>
刷新
</Button>
</div>
</div>
{overviewQuery.isLoading ? (
<LoadingStateWithBorder
title='加载总览数据'
description='正在聚合节点健康、流量与容量指标...'
/>
) : overviewQuery.isError ? (
<ErrorInline
message={`总览看板加载失败:${getErrorMessage(overviewQuery.error)}`}
onRetry={() => overviewQuery.refetch()}
/>
) : !overview ? (
<EmptyStateWithBorder
title='暂无总览数据'
description='系统已经启动,但还没有可展示的总览聚合结果。'
/>
) : (
<>
<WorldStage
summary={overview.summary}
traffic={overview.traffic}
capacity={overview.capacity}
nodes={overview.nodes}
sourceCountries={overview.distributions.source_countries}
/>
<div className='grid gap-6'>
<TrafficTrendChart points={overview.trends.traffic_24h}/>
</div>
<div className='grid gap-6 xl:grid-cols-3'>
<SourceDistributionChart
items={overview.distributions.source_countries}
/>
<StatusCodeDistributionChart
items={overview.distributions.status_codes}
/>
<TopDomainChart items={overview.distributions.top_domains}/>
</div>
<div className='grid gap-6'>
<TrafficCapacityTrendChart
networkPoints={overview.trends.network_24h}
capacityPoints={overview.trends.capacity_24h}
/>
</div>
<NodeHealthTable nodes={overview.nodes}/>
</>
)}
</div>
<div className='flex items-center gap-2 text-xs text-muted-foreground'>
{overview?.generated_at ? (
<span>数据生成于 {formatDateTime(overview.generated_at)}</span>
) : null}
<Button
variant='outline'
size='sm'
className='h-8'
onClick={() => overviewQuery.refetch()}
disabled={overviewQuery.isFetching}
>
<RefreshCw
className={`size-3.5 mr-1.5 ${overviewQuery.isFetching ? 'animate-spin' : ''}`}
/>
刷新
</Button>
</div>
</div>
{overviewQuery.isLoading ? (
<LoadingStateWithBorder
title='加载总览数据'
description='正在聚合节点健康、流量与容量指标...'
/>
) : overviewQuery.isError ? (
<ErrorInline
message={`总览看板加载失败:${getErrorMessage(overviewQuery.error)}`}
onRetry={() => overviewQuery.refetch()}
/>
) : !overview ? (
<EmptyStateWithBorder
title='暂无总览数据'
description='系统已经启动,但还没有可展示的总览聚合结果。'
/>
) : (
<>
<WorldStage
summary={overview.summary}
traffic={overview.traffic}
capacity={overview.capacity}
nodes={overview.nodes}
sourceCountries={overview.distributions.source_countries}
/>
<div className='grid gap-6 xl:grid-cols-2'>
<TrafficTrendChart points={overview.trends.traffic_24h} />
<CapacityTrendChart points={overview.trends.capacity_24h} />
</div>
<div className='grid gap-6'>
<NetworkDiskTrendChart
networkPoints={overview.trends.network_24h}
diskPoints={overview.trends.disk_io_24h}
/>
</div>
<div className='grid gap-6 xl:grid-cols-3'>
<SourceDistributionChart
items={overview.distributions.source_countries}
/>
<StatusCodeDistributionChart
items={overview.distributions.status_codes}
/>
<TopDomainChart items={overview.distributions.top_domains} />
</div>
<NodeHealthTable nodes={overview.nodes} />
</>
)}
</div>
);
);
}
@@ -89,6 +89,9 @@ function normalizeTrafficTrendPoints(
request_count: Number(item[1] ?? 0),
error_count: Number(item[2] ?? 0),
unique_visitor_count: Number(item[3] ?? 0),
status_2xx_count: Number(item[4] ?? 0),
status_4xx_count: Number(item[5] ?? 0),
status_5xx_count: Number(item[6] ?? 0),
}
: item,
);
+12 -1
View File
@@ -1159,6 +1159,9 @@ export interface TrafficTrendPoint {
request_count: number;
error_count: number;
unique_visitor_count: number;
status_2xx_count: number;
status_4xx_count: number;
status_5xx_count: number;
}
export interface CapacityTrendPoint {
@@ -1227,7 +1230,15 @@ export interface DashboardOverview {
nodes: DashboardNodeHealth[];
}
export type CompactTrafficTrendPoint = [string, number, number, number];
export type CompactTrafficTrendPoint = [
string,
number,
number,
number,
number,
number,
number,
];
export type CompactCapacityTrendPoint = [string, number, number, number];
/** [bucket, bytes_received, bytes_provided, reported_nodes] */
export type CompactNetworkTrendPoint = [string, number, number, number];