fix(truenas): добавлен вывод RAM в get_system_status
This commit is contained in:
+16
-1
@@ -157,6 +157,20 @@ class Tools:
|
|||||||
d = json.loads(raw)
|
d = json.loads(raw)
|
||||||
except Exception:
|
except Exception:
|
||||||
return "Ошибка парсинга"
|
return "Ошибка парсинга"
|
||||||
|
|
||||||
|
# Получаем RAM из system/get_info/
|
||||||
|
ram_s = "Н/Д"
|
||||||
|
ram_raw = self._rest_get("mem_info", "system/get_info/")
|
||||||
|
if ram_raw:
|
||||||
|
try:
|
||||||
|
mem_data = json.loads(ram_raw)
|
||||||
|
mem_bytes = mem_data.get("memory_size")
|
||||||
|
if mem_bytes:
|
||||||
|
ram_gb = mem_bytes / (1024**3)
|
||||||
|
ram_s = f"{ram_gb:.1f} GB"
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
ver = d.get("version", "N/A")
|
ver = d.get("version", "N/A")
|
||||||
model = d.get("model", "N/A")
|
model = d.get("model", "N/A")
|
||||||
load = d.get("loadavg", [])
|
load = d.get("loadavg", [])
|
||||||
@@ -177,7 +191,8 @@ class Tools:
|
|||||||
f"🖥️ TrueNAS: {ver}\n"
|
f"🖥️ TrueNAS: {ver}\n"
|
||||||
f"⏱️ Uptime: {up_s}\n"
|
f"⏱️ Uptime: {up_s}\n"
|
||||||
f"🔧 Процессор: {model}\n"
|
f"🔧 Процессор: {model}\n"
|
||||||
f"📊 Load Average: {load_s}"
|
f"📊 Load Average: {load_s}\n"
|
||||||
|
f"💾 RAM: {ram_s}"
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_pools_status(self) -> str:
|
def get_pools_status(self) -> str:
|
||||||
|
|||||||
Reference in New Issue
Block a user