Update simple monitor
Was not using the same library, now it is.
This commit is contained in:
@@ -13,24 +13,26 @@ Replace the stub return values with your real implementations later.
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
from typing import Tuple
|
from typing import Tuple
|
||||||
from systemsupport import systemData, CPULoad
|
from systemsupport import multiDriveStat, CPUInfo, CPULoad
|
||||||
|
|
||||||
sysdata = systemData()
|
sysdata = multiDriveStat()
|
||||||
|
cpuinfo = CPUInfo()
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Metrics function stubs
|
# Metrics function stubs
|
||||||
# --------------------------
|
# --------------------------
|
||||||
def getCPUTemp() -> float:
|
def getCPUTemp() -> float:
|
||||||
"""Return current CPU temperature in °C."""
|
"""Return current CPU temperature in °C."""
|
||||||
return float( sysdata.CPUTemperature )
|
return float( cpuinfo.temperature )
|
||||||
|
|
||||||
def getDriveTemp() -> float:
|
def getDriveTemp() -> float:
|
||||||
"""Return current NVMe drive temperature in °C."""
|
"""Return current NVMe drive temperature in °C."""
|
||||||
return sysdata.driveTemp
|
return sysdata.driveTemp( "nvme0n1" )
|
||||||
|
|
||||||
def getIORate() -> Tuple[float, float]:
|
def getIORate() -> Tuple[float, float]:
|
||||||
"""Return current NVMe IO rates (read_MBps, write_MBps)."""
|
"""Return current NVMe IO rates (read_MBps, write_MBps)."""
|
||||||
return sysdata.driveStats
|
data = sysdata.readWriteBytes()
|
||||||
|
return data["nvme0n1"]
|
||||||
|
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user