summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics/pages
diff options
context:
space:
mode:
authorSimon Rettberg2022-05-24 14:42:31 +0200
committerSimon Rettberg2022-05-24 14:42:31 +0200
commitf62092beb3fcf6ba48b4930b67a7dd579f2c1695 (patch)
tree35dabb44e2691d44182a4ab19010135b272bec07 /modules-available/statistics/pages
parent[rebootcontrol] Run reachability checks a little more often (diff)
downloadslx-admin-f62092beb3fcf6ba48b4930b67a7dd579f2c1695.tar.gz
slx-admin-f62092beb3fcf6ba48b4930b67a7dd579f2c1695.tar.xz
slx-admin-f62092beb3fcf6ba48b4930b67a7dd579f2c1695.zip
[statistics] Fix displaying CPU core/thread info
Diffstat (limited to 'modules-available/statistics/pages')
-rw-r--r--modules-available/statistics/pages/machine.inc.php4
1 files changed, 3 insertions, 1 deletions
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;