修复节点详情 OpenResty 连接数与吞吐显示为「—」：节点可观测 API 将 OpenResty 观测数据合并进 metric_snapshots；指标文案改为「请求/分钟」（近 60 秒窗口），连接数为 0 时正常显示 0。

internal/apps/openflare/observability/analytics.go

@@ -35,6 +35,27 @@ type TrafficDistributions struct {
 	SourceCountries []DistributionItem `json:"source_countries"`
 }
 
+const metricSnapshotOpenrestyMatchWindow = 2 * time.Minute
+
+// NodeMetricSnapshotView is a metric snapshot enriched with OpenResty observations.
+type NodeMetricSnapshotView struct {
+	ID                   uint      `json:"id,omitempty"`
+	NodeID               string    `json:"node_id,omitempty"`
+	CapturedAt           time.Time `json:"captured_at"`
+	CPUUsagePercent      float64   `json:"cpu_usage_percent"`
+	MemoryUsedBytes      int64     `json:"memory_used_bytes"`
+	MemoryTotalBytes     int64     `json:"memory_total_bytes"`
+	StorageUsedBytes     int64     `json:"storage_used_bytes"`
+	StorageTotalBytes    int64     `json:"storage_total_bytes"`
+	DiskReadBytes        int64     `json:"disk_read_bytes"`
+	DiskWriteBytes       int64     `json:"disk_write_bytes"`
+	NetworkRxBytes       int64     `json:"network_rx_bytes"`
+	NetworkTxBytes       int64     `json:"network_tx_bytes"`
+	OpenrestyRxBytes     int64     `json:"openresty_rx_bytes"`
+	OpenrestyTxBytes     int64     `json:"openresty_tx_bytes"`
+	OpenrestyConnections int64     `json:"openresty_connections"`
+}
+
 // TrafficWindowSummary summarizes a traffic reporting window.
 type TrafficWindowSummary struct {
 	WindowStartedAt    time.Time `json:"window_started_at"`
@@ -112,9 +133,9 @@ type diskCounterState struct {
 	seen  bool
 }
 
-func buildTrafficWindowSummary(report *model.OpenFlareRequestReport) TrafficWindowSummary {
+func buildTrafficWindowSummary(report *model.OpenFlareRequestReport) *TrafficWindowSummary {
 	if report == nil {
-		return TrafficWindowSummary{}
+		return nil
 	}
 	summary := TrafficWindowSummary{
 		WindowStartedAt:    report.WindowStartedAt,
@@ -129,7 +150,44 @@ func buildTrafficWindowSummary(report *model.OpenFlareRequestReport) TrafficWind
 	if report.RequestCount > 0 {
 		summary.ErrorRatePercent = (float64(report.ErrorCount) / float64(report.RequestCount)) * 100
 	}
-	return summary
+	return &summary
+}
+
+// BuildMetricSnapshotViews merges metric snapshots with OpenResty observations for API responses.
+func BuildMetricSnapshotViews(
+	snapshots []*model.OpenFlareMetricSnapshot,
+	openrestyObs []*model.OpenFlareNodeObservationOpenresty,
+) []*NodeMetricSnapshotView {
+	if len(snapshots) == 0 {
+		return []*NodeMetricSnapshotView{}
+	}
+	views := make([]*NodeMetricSnapshotView, 0, len(snapshots))
+	for _, snapshot := range snapshots {
+		if snapshot == nil {
+			continue
+		}
+		view := &NodeMetricSnapshotView{
+			ID:                snapshot.ID,
+			NodeID:            snapshot.NodeID,
+			CapturedAt:        snapshot.CapturedAt,
+			CPUUsagePercent:   snapshot.CPUUsagePercent,
+			MemoryUsedBytes:   snapshot.MemoryUsedBytes,
+			MemoryTotalBytes:  snapshot.MemoryTotalBytes,
+			StorageUsedBytes:  snapshot.StorageUsedBytes,
+			StorageTotalBytes: snapshot.StorageTotalBytes,
+			DiskReadBytes:     snapshot.DiskReadBytes,
+			DiskWriteBytes:    snapshot.DiskWriteBytes,
+			NetworkRxBytes:    snapshot.NetworkRxBytes,
+			NetworkTxBytes:    snapshot.NetworkTxBytes,
+		}
+		if matched := matchOpenrestyObservation(snapshot.CapturedAt, openrestyObs); matched != nil {
+			view.OpenrestyRxBytes = matched.OpenrestyRxBytes
+			view.OpenrestyTxBytes = matched.OpenrestyTxBytes
+			view.OpenrestyConnections = matched.OpenrestyConnections
+		}
+		views = append(views, view)
+	}
+	return views
 }
 
 // BuildTrafficDistributions aggregates traffic distribution charts.
@@ -352,21 +410,54 @@ func BuildDiskIOTrendPoints(now time.Time, snapshots []*model.OpenFlareMetricSna
 }
 
 func latestMetricSnapshot(snapshots []*model.OpenFlareMetricSnapshot) *model.OpenFlareMetricSnapshot {
+	var latest *model.OpenFlareMetricSnapshot
 	for _, snapshot := range snapshots {
-		if snapshot != nil {
-			return snapshot
+		if snapshot == nil {
+			continue
+		}
+		if latest == nil || snapshot.CapturedAt.After(latest.CapturedAt) {
+			latest = snapshot
 		}
 	}
-	return nil
+	return latest
 }
 
 func latestTrafficReport(reports []*model.OpenFlareRequestReport) *model.OpenFlareRequestReport {
+	var latest *model.OpenFlareRequestReport
 	for _, report := range reports {
-		if report != nil {
-			return report
+		if report == nil {
+			continue
+		}
+		if latest == nil || report.WindowEndedAt.After(latest.WindowEndedAt) {
+			latest = report
 		}
 	}
-	return nil
+	return latest
+}
+
+func matchOpenrestyObservation(
+	capturedAt time.Time,
+	observations []*model.OpenFlareNodeObservationOpenresty,
+) *model.OpenFlareNodeObservationOpenresty {
+	var matched *model.OpenFlareNodeObservationOpenresty
+	var bestDelta time.Duration = metricSnapshotOpenrestyMatchWindow + time.Second
+	for _, observation := range observations {
+		if observation == nil {
+			continue
+		}
+		delta := capturedAt.Sub(observation.CapturedAt)
+		if delta < 0 {
+			delta = -delta
+		}
+		if delta > metricSnapshotOpenrestyMatchWindow {
+			continue
+		}
+		if matched == nil || delta < bestDelta {
+			matched = observation
+			bestDelta = delta
+		}
+	}
+	return matched
 }
 
 // LatestMetricSnapshotsByNode returns the latest snapshot per node.

internal/apps/openflare/observability/analytics_test.go

@@ -51,4 +51,67 @@ func TestBuildTrafficTrendPointsBucketsByHour(t *testing.T) {
 	if currentHour.ErrorCount != 0 {
 		t.Fatalf("current hour error_count = %d, want 0", currentHour.ErrorCount)
 	}
-}
+}
+
+func TestBuildMetricSnapshotViewsMergesOpenrestyObservation(t *testing.T) {
+	t.Parallel()
+
+	capturedAt := time.Date(2026, 6, 19, 12, 0, 0, 0, time.UTC)
+	snapshots := []*model.OpenFlareMetricSnapshot{
+		{
+			ID:              1,
+			NodeID:          "node-a",
+			CapturedAt:      capturedAt,
+			CPUUsagePercent: 12.5,
+		},
+	}
+	openrestyObs := []*model.OpenFlareNodeObservationOpenresty{
+		{
+			NodeID:               "node-a",
+			CapturedAt:           capturedAt.Add(5 * time.Second),
+			OpenrestyRxBytes:     4096,
+			OpenrestyTxBytes:     8192,
+			OpenrestyConnections: 7,
+		},
+	}
+
+	views := BuildMetricSnapshotViews(snapshots, openrestyObs)
+	if len(views) != 1 {
+		t.Fatalf("BuildMetricSnapshotViews() len = %d, want 1", len(views))
+	}
+	if views[0].OpenrestyRxBytes != 4096 {
+		t.Fatalf("OpenrestyRxBytes = %d, want 4096", views[0].OpenrestyRxBytes)
+	}
+	if views[0].OpenrestyTxBytes != 8192 {
+		t.Fatalf("OpenrestyTxBytes = %d, want 8192", views[0].OpenrestyTxBytes)
+	}
+	if views[0].OpenrestyConnections != 7 {
+		t.Fatalf("OpenrestyConnections = %d, want 7", views[0].OpenrestyConnections)
+	}
+}
+
+func TestLatestTrafficReportUsesLatestWindowEndedAt(t *testing.T) {
+	t.Parallel()
+
+	older := &model.OpenFlareRequestReport{
+		WindowEndedAt: time.Date(2026, 6, 19, 10, 0, 0, 0, time.UTC),
+		RequestCount:  3,
+	}
+	newer := &model.OpenFlareRequestReport{
+		WindowEndedAt: time.Date(2026, 6, 19, 11, 0, 0, 0, time.UTC),
+		RequestCount:  9,
+	}
+
+	latest := latestTrafficReport([]*model.OpenFlareRequestReport{older, newer})
+	if latest == nil || latest.RequestCount != 9 {
+		t.Fatalf("latestTrafficReport() = %#v, want newer report with request_count 9", latest)
+	}
+}
+
+func TestBuildTrafficWindowSummaryNilWithoutReport(t *testing.T) {
+	t.Parallel()
+
+	if summary := buildTrafficWindowSummary(nil); summary != nil {
+		t.Fatalf("buildTrafficWindowSummary(nil) = %#v, want nil", summary)
+	}
+}

internal/apps/openflare/observability/node_logics.go

@@ -28,9 +28,9 @@ type NodeQuery struct {
 
 // NodeAnalytics groups node observability analytics.
 type NodeAnalytics struct {
-	Traffic       TrafficWindowSummary `json:"traffic"`
-	Distributions TrafficDistributions `json:"distributions"`
-	Health        HealthSummary        `json:"health"`
+	Traffic       *TrafficWindowSummary `json:"traffic"`
+	Distributions TrafficDistributions  `json:"distributions"`
+	Health        HealthSummary         `json:"health"`
 }
 
 // NodeTrends groups node observability trend series.
@@ -66,7 +66,7 @@ type RelayProxyStat struct {
 type NodeView struct {
 	NodeID          string                            `json:"node_id"`
 	Profile         *model.OpenFlareNodeSystemProfile `json:"profile"`
-	MetricSnapshots []*model.OpenFlareMetricSnapshot  `json:"metric_snapshots"`
+	MetricSnapshots []*NodeMetricSnapshotView         `json:"metric_snapshots"`
 	TrafficReports  []*model.OpenFlareRequestReport   `json:"traffic_reports"`
 	HealthEvents    []*model.OpenFlareHealthEvent     `json:"health_events"`
 	Analytics       NodeAnalytics                     `json:"analytics"`
@@ -103,6 +103,10 @@ func GetNodeObservability(ctx context.Context, id uint, query NodeQuery) (*NodeV
 	if err != nil {
 		return nil, err
 	}
+	openrestyObs, err := model.ListOpenFlareNodeObservationOpenresty(ctx, node.NodeID, since, limit)
+	if err != nil {
+		return nil, err
+	}
 	reports, err := model.ListOpenFlareRequestReportsSince(ctx, node.NodeID, since, limit)
 	if err != nil {
 		return nil, err
@@ -131,7 +135,7 @@ func GetNodeObservability(ctx context.Context, id uint, query NodeQuery) (*NodeV
 	view := &NodeView{
 		NodeID:          node.NodeID,
 		Profile:         profile,
-		MetricSnapshots: snapshots,
+		MetricSnapshots: BuildMetricSnapshotViews(snapshots, openrestyObs),
 		TrafficReports:  reports,
 		HealthEvents:    events,
 		Analytics: NodeAnalytics{