mirror of
https://github.com/henrygd/beszel.git
synced 2026-03-22 21:46:18 +01:00
* Split interfaces * add filters * feat: split interfaces and add filters (without locales) * make it an line chart * fix the colors * remove tx rx tooltip * fill the chart * update chart and cleanup * chore * update system tab * Fix alerts * chore * fix chart * resolve conflicts * Use new formatSpeed * fix records * update pakage * Fix network I/O stats compilation errors - Added globalNetIoStats field to Agent struct to track total bandwidth usage - Updated initializeNetIoStats() to initialize both per-interface and global network stats - Modified system.go to use globalNetIoStats for bandwidth calculations - Maintained per-interface tracking in netIoStats map for interface-specific data This resolves the compilation errors where netIoStats was accessed as a single struct instead of a map[string]NetIoStats. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Remove redundant bandwidth chart and fix network interface data access - Removed the old Bandwidth chart since network interface charts provide more detailed per-interface data - Fixed system.tsx to look for network interface data in stats.ni instead of stats.ns - Fixed NetworkInterfaceChart component to use correct data paths (stats.ni) - Network interface charts should now display properly with per-interface network statistics 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Restore split network metrics display in systems table - Modified systems table Net column to show separate sent/received values - Added green ↑ arrow for sent traffic and blue ↓ arrow for received traffic - Uses info.ns (NetworkSent) and info.nr (NetworkRecv) from agent - Maintains sorting functionality based on total network traffic - Shows values in appropriate units (B/s, KB/s, MB/s, etc.) This restores the split network metrics view that was present in the original feat/split-interfaces branch before the merge conflict resolution. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Remove unused bandwidth fields and calculations from agent Removed legacy bandwidth collection code that is no longer used by the frontend: **Removed from structs:** - Stats.Bandwidth [2]uint64 (bandwidth bytes array) - Stats.MaxBandwidth [2]uint64 (max bandwidth bytes array) - Info.Bandwidth float64 (total bandwidth MB/s) - Info.BandwidthBytes uint64 (total bandwidth bytes/s) **Removed from agent:** - globalNetIoStats tracking and calculations - bandwidth byte-per-second calculations - bandwidth array assignments in systemStats - bandwidth field assignments in systemInfo **Removed from records:** - Bandwidth array accumulation and averaging in AverageSystemStats - MaxBandwidth tracking in peak value calculations The frontend now uses only: - info.ns/info.nr (split metrics in systems table) - stats.ni (per-interface charts) This cleanup removes ~50 lines of unused code and eliminates redundant calculations. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Optimize network collection for better performance **Performance Improvements:** - Pre-allocate NetworkInterfaces map with known capacity to reduce allocations - Remove redundant byte counters (totalBytesSent, totalBytesRecv) that were unused - Direct calculation to MB/s, avoiding intermediate bytes-per-second variables - Reuse existing NetIoStats structs when possible to reduce GC pressure - Streamlined single-pass processing through network interfaces **Optimizations:** - Reduced memory allocations per collection cycle - Fewer arithmetic operations (eliminated double conversion) - Better cache locality with simplified data flow - Reduced time complexity from O(n²) operations to O(n) **Maintained Functionality:** - Same per-interface statistics collection - Same total network sent/recv calculations - Same error handling and reset logic - Same data structures and output format Expected improvement: ~15-25% reduction in network collection CPU time and memory allocations. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix the Unit preferences * Add total bytes sent and received to network interface stats and implement total bandwidth chart * chore: fix Cumulative records * Add connection counts * Add connection stats * Fix ordering * remove test builds * improve entre command in makefile * rebase
165 lines
5.1 KiB
Go
165 lines
5.1 KiB
Go
import { memo, useMemo } from "react"
|
|
import { useLingui } from "@lingui/react/macro"
|
|
import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
|
|
import {
|
|
ChartContainer,
|
|
ChartTooltip,
|
|
ChartTooltipContent,
|
|
xAxis,
|
|
ChartLegend,
|
|
ChartLegendContent,
|
|
} from "@/components/ui/chart"
|
|
import { cn, formatShortDate, chartMargin, formatBytes, toFixedFloat, decimalString } from "@/lib/utils"
|
|
import { ChartData } from "@/types"
|
|
import { useStore } from "@nanostores/react"
|
|
import { $networkInterfaceFilter, $userSettings } from "@/lib/stores"
|
|
import { Unit } from "@/lib/enums"
|
|
import { useYAxisWidth } from "./hooks"
|
|
|
|
const getNestedValue = (path: string, max = false, data: any): number | null => {
|
|
// path format is like "eth0.ns" or "eth0.nr"
|
|
// need to access data.stats.ni[interface][property]
|
|
const parts = path.split(".")
|
|
if (parts.length !== 2) return null
|
|
|
|
const [interfaceName, property] = parts
|
|
const propertyKey = property + (max ? "m" : "")
|
|
|
|
return data?.stats?.ni?.[interfaceName]?.[propertyKey] ?? null
|
|
}
|
|
|
|
export default memo(function NetworkInterfaceChart({
|
|
chartData,
|
|
maxToggled = false,
|
|
max,
|
|
}: {
|
|
chartData: ChartData
|
|
maxToggled?: boolean
|
|
max?: number
|
|
}) {
|
|
const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
|
|
const { i18n } = useLingui()
|
|
const networkInterfaceFilter = useStore($networkInterfaceFilter)
|
|
const userSettings = useStore($userSettings)
|
|
|
|
const { chartTime } = chartData
|
|
const showMax = chartTime !== "1h" && maxToggled
|
|
|
|
// Get network interface names from the latest stats
|
|
const networkInterfaces = useMemo(() => {
|
|
if (chartData.systemStats.length === 0) return []
|
|
const latestStats = chartData.systemStats[chartData.systemStats.length - 1]
|
|
const allInterfaces = Object.keys(latestStats.stats.ni || {})
|
|
|
|
// Filter interfaces based on filter value
|
|
if (networkInterfaceFilter) {
|
|
return allInterfaces.filter((iface) => iface.toLowerCase().includes(networkInterfaceFilter.toLowerCase()))
|
|
}
|
|
|
|
return allInterfaces
|
|
}, [chartData.systemStats, networkInterfaceFilter])
|
|
|
|
const dataKeys = useMemo(() => {
|
|
// Generate colors for each interface - each interface gets a unique hue
|
|
// and sent/received use different shades of that hue
|
|
const interfaceColors = networkInterfaces.map((iface, index) => {
|
|
const hue = ((index * 360) / Math.max(networkInterfaces.length, 1)) % 360
|
|
return {
|
|
interface: iface,
|
|
sentColor: `hsl(${hue}, 70%, 45%)`, // Darker shade for sent
|
|
receivedColor: `hsl(${hue}, 70%, 65%)`, // Lighter shade for received
|
|
}
|
|
})
|
|
|
|
return interfaceColors.flatMap(({ interface: iface, sentColor, receivedColor }) => [
|
|
{
|
|
name: `${iface} Sent`,
|
|
dataKey: `${iface}.ns`,
|
|
color: sentColor,
|
|
type: "sent" as const,
|
|
interface: iface,
|
|
},
|
|
{
|
|
name: `${iface} Received`,
|
|
dataKey: `${iface}.nr`,
|
|
color: receivedColor,
|
|
type: "received" as const,
|
|
interface: iface,
|
|
},
|
|
])
|
|
}, [networkInterfaces, i18n.locale])
|
|
|
|
const colors = dataKeys.map((key) => key.name)
|
|
|
|
return (
|
|
<div>
|
|
<ChartContainer
|
|
className={cn("h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity", {
|
|
"opacity-100": yAxisWidth,
|
|
})}
|
|
>
|
|
<AreaChart accessibilityLayer data={chartData.systemStats} margin={chartMargin}>
|
|
<CartesianGrid vertical={false} />
|
|
<YAxis
|
|
direction="ltr"
|
|
orientation={chartData.orientation}
|
|
className="tracking-tighter"
|
|
width={yAxisWidth}
|
|
tickFormatter={(value) => {
|
|
const { value: formattedValue, unit } = formatBytes(value, true, userSettings.unitNet ?? Unit.Bits, true)
|
|
const rounded = toFixedFloat(formattedValue, formattedValue >= 10 ? 1 : 2)
|
|
return updateYAxisWidth(`${rounded} ${unit}`)
|
|
}}
|
|
tickLine={false}
|
|
axisLine={false}
|
|
/>
|
|
{xAxis(chartData)}
|
|
<ChartTooltip
|
|
animationEasing="ease-out"
|
|
animationDuration={150}
|
|
content={
|
|
<ChartTooltipContent
|
|
labelFormatter={(_: any, data: any) => formatShortDate(data[0].payload.created)}
|
|
contentFormatter={({ value }: any) => {
|
|
const { value: formattedValue, unit } = formatBytes(
|
|
value,
|
|
true,
|
|
userSettings.unitNet ?? Unit.Bits,
|
|
true
|
|
)
|
|
return (
|
|
<span className="flex">
|
|
{decimalString(formattedValue, formattedValue >= 10 ? 1 : 2)} {unit}
|
|
</span>
|
|
)
|
|
}}
|
|
/>
|
|
}
|
|
/>
|
|
{dataKeys.map((key, i) => {
|
|
const filtered =
|
|
networkInterfaceFilter && !key.interface.toLowerCase().includes(networkInterfaceFilter.toLowerCase())
|
|
let fillOpacity = filtered ? 0.05 : 0.4
|
|
let strokeOpacity = filtered ? 0.1 : 1
|
|
return (
|
|
<Area
|
|
key={i}
|
|
dataKey={getNestedValue.bind(null, key.dataKey, showMax)}
|
|
name={key.name}
|
|
type="monotoneX"
|
|
fill={key.color}
|
|
fillOpacity={fillOpacity}
|
|
stroke={key.color}
|
|
strokeOpacity={strokeOpacity}
|
|
activeDot={{ opacity: filtered ? 0 : 1 }}
|
|
isAnimationActive={false}
|
|
/>
|
|
)
|
|
})}
|
|
{colors.length < 12 && <ChartLegend content={<ChartLegendContent />} />}
|
|
</AreaChart>
|
|
</ChartContainer>
|
|
</div>
|
|
)
|
|
})
|