Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-02 21:43:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Glances widget display (#3164)

Browse Source 
Co-Authored-By: shamoon <4887959+shamoon@users.noreply.github.com>
This commit is contained in:
SunnyCloudy 2024-03-23 10:51:10 +02:00 committed by shamoon
parent 885b2624a8
commit e4b4eba445
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/widgets/services/glances.md
View File

@ -19,6 +19,8 @@ widget:
password: pass # optional if auth enabled in Glances password: pass # optional if auth enabled in Glances
metric: cpu metric: cpu
diskUnits: bytes # optional, bytes (default) or bbytes. Only applies to disk diskUnits: bytes # optional, bytes (default) or bbytes. Only applies to disk
refreshInterval: 5000 # optional - in milliseconds, defaults to 1000 or more, depending on the metric
pointsLimit: 15 # optional, defaults to 15
``` ```
_Please note, this widget does not need an `href`, `icon` or `description` on its parent service. To achieve the same effect as the examples above, see as an example:_ _Please note, this widget does not need an `href`, `icon` or `description` on its parent service. To achieve the same effect as the examples above, see as an example:_

17
src/widgets/glances/metrics/cpu.jsx
View File

@ -24,7 +24,7 @@ export default function Component({ service }) {
refreshInterval: Math.max(defaultInterval, refreshInterval), refreshInterval: Math.max(defaultInterval, refreshInterval),
}); });
const { data: systemData, error: systemError } = useWidgetAPI(service.widget, "system"); const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, "quicklook");
useEffect(() => { useEffect(() => {
if (data) { if (data) {
@ -71,22 +71,15 @@ export default function Component({ service }) {
/> />
)} )}
{!chart && systemData && !systemError && ( {!chart && quicklookData && !quicklookError && (
<Block position="top-3 right-3"> <Block position="top-3 right-3">
<div className="text-xs opacity-50"> <div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name && quicklookData.cpu_name}</div>
{systemData.linux_distro && `${systemData.linux_distro} - `}
{systemData.os_version && systemData.os_version}
</div>
</Block> </Block>
)} )}
{systemData && !systemError && ( {quicklookData && !quicklookError && (
<Block position="bottom-3 left-3"> <Block position="bottom-3 left-3">
{systemData.linux_distro && chart && <div className="text-xs opacity-50">{systemData.linux_distro}</div>} {quicklookData.cpu_name && chart && <div className="text-xs opacity-50">{quicklookData.cpu_name}</div>}
{systemData.os_version && chart && <div className="text-xs opacity-50">{systemData.os_version}</div>}
{systemData.hostname && <div className="text-xs opacity-50">{systemData.hostname}</div>}
</Block> </Block>
)} )}

7
src/widgets/glances/metrics/info.jsx
View File

@ -122,7 +122,10 @@ export default function Component({ service }) {
)} )}
{!chart && quicklookData?.swap === 0 && ( {!chart && quicklookData?.swap === 0 && (
<div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name}</div> <div className="text-[0.6rem] opacity-50">
{systemData && systemData.linux_distro && `${systemData.linux_distro} - `}
{systemData && systemData.os_version}
</div>
)} )}
<div className="w-[4rem]">{!chart && <Swap quicklookData={quicklookData} className="opacity-25" />}</div> <div className="w-[4rem]">{!chart && <Swap quicklookData={quicklookData} className="opacity-25" />}</div>
@ -137,7 +140,7 @@ export default function Component({ service }) {
)} )}
{!chart && ( {!chart && (
<Block position="bottom-3 left-3 w-[3rem]"> <Block position="bottom-3 left-3 w-[4rem]">
<CPU quicklookData={quicklookData} className="opacity-75" /> <CPU quicklookData={quicklookData} className="opacity-75" />
</Block> </Block>
)} )}