mirror of
https://github.com/henrygd/beszel.git
synced 2026-03-23 14:06:18 +01:00
Changes container network statistics to use raw byte values instead of converting to megabytes agent-side, providing more accurate measurements for low-bandwidth containers. Maintains backward compatibility with older agents/hubs through fallback logic. - Agent now sends Bandwidth field as [sent_bytes, recv_bytes] array - Deprecated NetworkSent/NetworkRecv fields still populated for compatibility - Hub and frontend fall back to deprecated fields when Bandwidth is zero - Record averaging correctly handles both old and new formats - TODO markers added for cleanup in version 0.19+
212 lines
6.4 KiB
Go
212 lines
6.4 KiB
Go
// import Spinner from '../spinner'
|
|
import { useStore } from "@nanostores/react"
|
|
import { memo, useMemo } from "react"
|
|
import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
|
|
import {
|
|
type ChartConfig,
|
|
ChartContainer,
|
|
ChartTooltip,
|
|
ChartTooltipContent,
|
|
pinnedAxisDomain,
|
|
xAxis,
|
|
} from "@/components/ui/chart"
|
|
import { ChartType, Unit } from "@/lib/enums"
|
|
import { $containerFilter, $userSettings } from "@/lib/stores"
|
|
import { chartMargin, cn, decimalString, formatBytes, formatShortDate, toFixedFloat } from "@/lib/utils"
|
|
import type { ChartData } from "@/types"
|
|
import { Separator } from "../ui/separator"
|
|
import { useYAxisWidth } from "./hooks"
|
|
|
|
export default memo(function ContainerChart({
|
|
dataKey,
|
|
chartData,
|
|
chartType,
|
|
chartConfig,
|
|
unit = "%",
|
|
}: {
|
|
dataKey: string
|
|
chartData: ChartData
|
|
chartType: ChartType
|
|
chartConfig: ChartConfig
|
|
unit?: string
|
|
}) {
|
|
const filter = useStore($containerFilter)
|
|
const userSettings = useStore($userSettings)
|
|
const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
|
|
|
|
const { containerData } = chartData
|
|
|
|
const isNetChart = chartType === ChartType.Network
|
|
|
|
// biome-ignore lint/correctness/useExhaustiveDependencies: not necessary
|
|
const { toolTipFormatter, dataFunction, tickFormatter } = useMemo(() => {
|
|
const obj = {} as {
|
|
toolTipFormatter: (item: any, key: string) => React.ReactNode | string
|
|
dataFunction: (key: string, data: any) => number | null
|
|
tickFormatter: (value: any) => string
|
|
}
|
|
// tick formatter
|
|
if (chartType === ChartType.CPU) {
|
|
obj.tickFormatter = (value) => {
|
|
const val = `${toFixedFloat(value, 2)}%`
|
|
return updateYAxisWidth(val)
|
|
}
|
|
} else {
|
|
const chartUnit = isNetChart ? userSettings.unitNet : Unit.Bytes
|
|
obj.tickFormatter = (val) => {
|
|
const { value, unit } = formatBytes(val, isNetChart, chartUnit, !isNetChart)
|
|
return updateYAxisWidth(`${toFixedFloat(value, value >= 10 ? 0 : 1)} ${unit}`)
|
|
}
|
|
}
|
|
// tooltip formatter
|
|
if (isNetChart) {
|
|
const getRxTxBytes = (record?: { b?: [number, number]; ns?: number; nr?: number }) => {
|
|
if (record?.b?.length && record.b.length >= 2) {
|
|
return [Number(record.b[0]) || 0, Number(record.b[1]) || 0]
|
|
}
|
|
return [(record?.ns ?? 0) * 1024 * 1024, (record?.nr ?? 0) * 1024 * 1024]
|
|
}
|
|
const formatRxTx = (recv: number, sent: number) => {
|
|
const { value: receivedValue, unit: receivedUnit } = formatBytes(recv, true, userSettings.unitNet, false)
|
|
const { value: sentValue, unit: sentUnit } = formatBytes(sent, true, userSettings.unitNet, false)
|
|
return (
|
|
<span className="flex">
|
|
{decimalString(receivedValue)} {receivedUnit}
|
|
<span className="opacity-70 ms-0.5"> rx </span>
|
|
<Separator orientation="vertical" className="h-3 mx-1.5 bg-primary/40" />
|
|
{decimalString(sentValue)} {sentUnit}
|
|
<span className="opacity-70 ms-0.5"> tx</span>
|
|
</span>
|
|
)
|
|
}
|
|
obj.toolTipFormatter = (item: any, key: string) => {
|
|
try {
|
|
if (key === "__total__") {
|
|
let totalSent = 0
|
|
let totalRecv = 0
|
|
const payloadData = item?.payload && typeof item.payload === "object" ? item.payload : {}
|
|
for (const value of Object.values(payloadData)) {
|
|
if (!value || typeof value !== "object") {
|
|
continue
|
|
}
|
|
const [sent, recv] = getRxTxBytes(value as { b?: [number, number]; ns?: number; nr?: number })
|
|
totalSent += sent
|
|
totalRecv += recv
|
|
}
|
|
return formatRxTx(totalRecv, totalSent)
|
|
}
|
|
const [sent, recv] = getRxTxBytes(item?.payload?.[key])
|
|
return formatRxTx(recv, sent)
|
|
} catch (e) {
|
|
return null
|
|
}
|
|
}
|
|
} else if (chartType === ChartType.Memory) {
|
|
obj.toolTipFormatter = (item: any) => {
|
|
const { value, unit } = formatBytes(item.value, false, Unit.Bytes, true)
|
|
return `${decimalString(value)} ${unit}`
|
|
}
|
|
} else {
|
|
obj.toolTipFormatter = (item: any) => `${decimalString(item.value)}${unit}`
|
|
}
|
|
// data function
|
|
if (isNetChart) {
|
|
obj.dataFunction = (key: string, data: any) => {
|
|
const payload = data[key]
|
|
if (!payload) {
|
|
return null
|
|
}
|
|
const sent = payload?.b?.[0] ?? (payload?.ns ?? 0) * 1024 * 1024
|
|
const recv = payload?.b?.[1] ?? (payload?.nr ?? 0) * 1024 * 1024
|
|
return sent + recv
|
|
}
|
|
} else {
|
|
obj.dataFunction = (key: string, data: any) => data[key]?.[dataKey] ?? null
|
|
}
|
|
return obj
|
|
}, [])
|
|
|
|
// Filter with set lookup
|
|
const filteredKeys = useMemo(() => {
|
|
if (!filter) {
|
|
return new Set<string>()
|
|
}
|
|
const filterTerms = filter
|
|
.toLowerCase()
|
|
.split(" ")
|
|
.filter((term) => term.length > 0)
|
|
return new Set(
|
|
Object.keys(chartConfig).filter((key) => {
|
|
const keyLower = key.toLowerCase()
|
|
return !filterTerms.some((term) => keyLower.includes(term))
|
|
})
|
|
)
|
|
}, [chartConfig, filter])
|
|
|
|
// console.log('rendered at', new Date())
|
|
|
|
if (containerData.length === 0) {
|
|
return null
|
|
}
|
|
|
|
return (
|
|
<div>
|
|
<ChartContainer
|
|
className={cn("h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity", {
|
|
"opacity-100": yAxisWidth,
|
|
})}
|
|
>
|
|
<AreaChart
|
|
accessibilityLayer
|
|
// syncId={'cpu'}
|
|
data={containerData}
|
|
margin={chartMargin}
|
|
reverseStackOrder={true}
|
|
>
|
|
<CartesianGrid vertical={false} />
|
|
<YAxis
|
|
direction="ltr"
|
|
domain={pinnedAxisDomain()}
|
|
orientation={chartData.orientation}
|
|
className="tracking-tighter"
|
|
width={yAxisWidth}
|
|
tickFormatter={tickFormatter}
|
|
tickLine={false}
|
|
axisLine={false}
|
|
/>
|
|
{xAxis(chartData)}
|
|
<ChartTooltip
|
|
animationEasing="ease-out"
|
|
animationDuration={150}
|
|
truncate={true}
|
|
labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
|
|
// @ts-expect-error
|
|
itemSorter={(a, b) => b.value - a.value}
|
|
content={<ChartTooltipContent filter={filter} contentFormatter={toolTipFormatter} showTotal={true} />}
|
|
/>
|
|
{Object.keys(chartConfig).map((key) => {
|
|
const filtered = filteredKeys.has(key)
|
|
const fillOpacity = filtered ? 0.05 : 0.4
|
|
const strokeOpacity = filtered ? 0.1 : 1
|
|
return (
|
|
<Area
|
|
key={key}
|
|
isAnimationActive={false}
|
|
dataKey={dataFunction.bind(null, key)}
|
|
name={key}
|
|
type="monotoneX"
|
|
fill={chartConfig[key].color}
|
|
fillOpacity={fillOpacity}
|
|
stroke={chartConfig[key].color}
|
|
strokeOpacity={strokeOpacity}
|
|
activeDot={{ opacity: filtered ? 0 : 1 }}
|
|
stackId="a"
|
|
/>
|
|
)
|
|
})}
|
|
</AreaChart>
|
|
</ChartContainer>
|
|
</div>
|
|
)
|
|
})
|