fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-19 17:59:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve podman support (#211)

Browse Source
This commit is contained in:
Henry Dollman
2024-11-12 11:59:56 -05:00
parent db092d2440
commit 3cd11d6bc4
5 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
beszel/site/src/components/routes/system.tsx
View File

@@ -86,6 +86,13 @@ async function getStats<T>(collection: string, system: SystemRecord, chartTime:
})
}
function dockerOrPodman(str: string, system: SystemRecord) {
if (system.info.p) {
str = str.replace("docker", "podman").replace("Docker", "Podman")
}
return str
}
export default function SystemDetail({ name }: { name: string }) {
const direction = useStore($direction)
const { _ } = useLingui()
@@ -385,7 +392,7 @@ export default function SystemDetail({ name }: { name: string }) {
<ChartCard
empty={dataEmpty}
grid={grid}
title={t`Docker CPU Usage`}
title={dockerOrPodman(t`Docker CPU Usage`, system)}
description={t`Average CPU utilization of containers`}
cornerEl={containerFilterBar}
>
@@ -406,8 +413,8 @@ export default function SystemDetail({ name }: { name: string }) {
<ChartCard
empty={dataEmpty}
grid={grid}
title={t`Docker Memory Usage`}
description={t`Memory usage of docker containers`}
title={dockerOrPodman(t`Docker Memory Usage`, system)}
description={dockerOrPodman(t`Memory usage of docker containers`, system)}
cornerEl={containerFilterBar}
>
<ContainerChart chartData={chartData} chartName="mem" dataKey="m" unit=" MB" />
@@ -447,8 +454,8 @@ export default function SystemDetail({ name }: { name: string }) {
>
<ChartCard
empty={dataEmpty}
title={t`Docker Network I/O`}
description={t`Network traffic of docker containers`}
title={dockerOrPodman(t`Docker Network I/O`, system)}
description={dockerOrPodman(t`Network traffic of docker containers`, system)}
cornerEl={containerFilterBar}
>
{/* @ts-ignore */}
@@ -649,7 +656,7 @@ function ChartCard({
<CardDescription>{description}</CardDescription>
{cornerEl && <div className="relative py-1 block sm:w-44 sm:absolute sm:top-2.5 sm:end-3.5">{cornerEl}</div>}
</CardHeader>
<div className="ps-0 w-[calc(100%-1.6em)] h-52 relative">
<div className="ps-0 w-[calc(100%-1.5em)] h-52 relative">
{<Spinner msg={empty ? t`Waiting for enough records to display` : undefined} />}
{isIntersecting && children}
</div>

2
beszel/site/src/types.d.ts vendored
View File

@@ -34,6 +34,8 @@ export interface SystemInfo {
b: number
/** agent version */
v: string
/** system is using podman */
p?: boolean
}
export interface SystemStats {