diff --git a/docs/widgets/services/glances.md b/docs/widgets/services/glances.md index 69676bc65..176892931 100644 --- a/docs/widgets/services/glances.md +++ b/docs/widgets/services/glances.md @@ -19,7 +19,6 @@ widget: password: pass # optional if auth enabled in Glances metric: cpu diskUnits: bytes # optional, bytes (default) or bbytes. Only applies to disk - tempUnits: imperial # optional, metric (default) or imperial. Only applies to cpu refreshInterval: 5000 # optional - in milliseconds, defaults to 1000 or more, depending on the metric pointsLimit: 15 # optional, defaults to 15 ``` diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 9fa733ba0..c4ca2a65b 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -398,7 +398,6 @@ export function cleanServiceGroups(groups) { metric, pointsLimit, diskUnits, - tempUnits, // glances, customapi, iframe refreshInterval, @@ -538,7 +537,6 @@ export function cleanServiceGroups(groups) { if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval; if (pointsLimit) cleanedService.widget.pointsLimit = pointsLimit; if (diskUnits) cleanedService.widget.diskUnits = diskUnits; - if (tempUnits) cleanedService.widget.tempUnits = tempUnits; } if (type === "mjpeg") { if (stream) cleanedService.widget.stream = stream; diff --git a/src/widgets/glances/metrics/cpu.jsx b/src/widgets/glances/metrics/cpu.jsx index 3e98efe0b..1f2824d3f 100644 --- a/src/widgets/glances/metrics/cpu.jsx +++ b/src/widgets/glances/metrics/cpu.jsx @@ -12,61 +12,6 @@ const Chart = dynamic(() => import("../components/chart"), { ssr: false }); const defaultPointsLimit = 15; const defaultInterval = 1000; -const cpuSensorLabels = ["cpu_thermal", "Core", "Tctl"]; - -function convertToFahrenheit(t) { - return (t * 9) / 5 + 32; -} - -function TEMP({ sensorData, tempUnits = "metric" }) { - const { t } = useTranslation(); - const unit = tempUnits === "imperial" ? "fahrenheit" : "celsius"; - let mainTemp = 0; - let maxTemp = 80; - const cpuSensors = sensorData?.filter( - (s) => cpuSensorLabels.some((label) => s.label.startsWith(label)) && s.type === "temperature_core", - ); - - if (cpuSensors) { - try { - mainTemp = cpuSensors.reduce((acc, s) => acc + s.value, 0) / cpuSensors.length; - maxTemp = Math.max( - cpuSensors.reduce((acc, s) => acc + (s.warning > 0 ? s.warning : 0), 0) / cpuSensors.length, - maxTemp, - ); - if (unit === "fahrenheit") { - mainTemp = convertToFahrenheit(mainTemp); - maxTemp = convertToFahrenheit(maxTemp); - } - } catch (e) { - // cpu sensor retrieval failed - } - } - - return ( - mainTemp > 0 && ( -
-
- {t("common.number", { - value: mainTemp, - maximumFractionDigits: 1, - style: "unit", - unit, - })} -
-
- {"("}{t("glances.warn")}{" @ "} - {t("common.number", { - value: maxTemp, - maximumFractionDigits: 1, - style: "unit", - unit, - })}{")"} -
-
- ) - ); -} export default function Component({ service }) { const { t } = useTranslation(); @@ -79,10 +24,6 @@ export default function Component({ service }) { refreshInterval: Math.max(defaultInterval, refreshInterval), }); - const { data: sensorData, error: sensorError } = useWidgetAPI(service.widget, "sensors", { - refreshInterval: Math.max(defaultInterval, refreshInterval), - }); - const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, "quicklook"); useEffect(() => { @@ -132,16 +73,12 @@ export default function Component({ service }) { {!chart && quicklookData && !quicklookError && ( -
- {quicklookData.cpu_name && quicklookData.cpu_name} -
+
{quicklookData.cpu_name && quicklookData.cpu_name}
)} {quicklookData && !quicklookError && ( - - {quicklookData.cpu_name && chart &&
{quicklookData.cpu_name}
}
)} diff --git a/src/widgets/glances/metrics/info.jsx b/src/widgets/glances/metrics/info.jsx index 9618af79e..ea90cc54e 100644 --- a/src/widgets/glances/metrics/info.jsx +++ b/src/widgets/glances/metrics/info.jsx @@ -13,7 +13,7 @@ function Swap({ quicklookData, className = "" }) { quicklookData && quicklookData.swap !== 0 && (
-
{t("glances.swap")}
+
{t("glances.swap")}
{t("common.number", { value: quicklookData.swap, @@ -34,7 +34,7 @@ function CPU({ quicklookData, className = "" }) { quicklookData && quicklookData.cpu && (
-
{t("glances.cpu")}
+
{t("glances.cpu")}
{t("common.number", { value: quicklookData.cpu, @@ -55,7 +55,7 @@ function Mem({ quicklookData, className = "" }) { quicklookData && quicklookData.mem && (
-
{t("glances.mem")}
+
{t("glances.mem")}
{t("common.number", { value: quicklookData.mem, @@ -124,7 +124,7 @@ export default function Component({ service }) { {!chart && quicklookData?.swap === 0 && (
{systemData && systemData.linux_distro && `${systemData.linux_distro} - `} - {systemData && systemData.os_version && systemData.os_version} + {systemData && systemData.os_version}
)} @@ -140,7 +140,7 @@ export default function Component({ service }) { )} {!chart && ( - + )}