diff options
3 files changed, 9 insertions, 7 deletions
diff --git a/modules-available/statistics/inc/hardwareparserlegacy.inc.php b/modules-available/statistics/inc/hardwareparserlegacy.inc.php index 2965a3fb..7ee39bce 100644 --- a/modules-available/statistics/inc/hardwareparserlegacy.inc.php +++ b/modules-available/statistics/inc/hardwareparserlegacy.inc.php @@ -193,9 +193,9 @@ class HardwareParserLegacy foreach ($out as $entry) { $tmp[str_replace(' ', '', $entry[1])] = $entry[2]; } - $row['cpu']['sockets'] = $tmp['Sockets']; - $row['cpu']['cores'] = $tmp['Realcores']; - $row['cpu']['threads'] = $tmp['Virtualcores']; + $row['cpu-sockets'] = $tmp['Sockets']; + $row['cpu-cores'] = $tmp['Realcores']; + $row['cpu-threads'] = $tmp['Virtualcores']; } public static function parseDmiDecode(&$row, $data) diff --git a/modules-available/statistics/pages/machine.inc.php b/modules-available/statistics/pages/machine.inc.php index 0b951396..250331cf 100644 --- a/modules-available/statistics/pages/machine.inc.php +++ b/modules-available/statistics/pages/machine.inc.php @@ -467,7 +467,6 @@ class SubPage private static function parseJson(string $uuid, array $json): array { $return = [ - 'cpu' => $json['cpu'] ?? [], 'lspci' => $json['lspci'] ?? [], 'ram' => array_map(function($item) { return HardwareParser::prepareDmiProperties($item); @@ -491,6 +490,9 @@ class SubPage $q = new HardwareQuery(HardwareInfo::MAINBOARD, $uuid); $q->addGlobalColumn('Memory Maximum Capacity'); $q->addGlobalColumn('Memory Slot Count'); + $q->addLocalColumn('cpu-sockets'); + $q->addLocalColumn('cpu-cores'); + $q->addLocalColumn('cpu-threads'); $res = $q->query()->fetch(); if (is_array($res)) { $return += $res; diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 0a2e2a74..2fc191ec 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -230,11 +230,11 @@ <td class="text-nowrap">{{lang_cpuModel}}</td> <td> {{cpumodel}} - {{#cpu.sockets}} + {{#cpu-sockets}} <div class="small"> - {{lang_sockets}}: {{cpu.sockets}}, {{lang_cores}}: {{cpu.cores}}, {{lang_virtualCores}}: {{cpu.threads}} + {{lang_sockets}}: {{cpu-sockets}}, {{lang_cores}}: {{cpu-cores}}, {{lang_virtualCores}}: {{cpu-threads}} </div> - {{/cpu.sockets}} + {{/cpu-sockets}} {{#live_cpuload_s}} <div class="meter"> <div class="text left">{{lang_cpuload}}</div> |