From f62092beb3fcf6ba48b4930b67a7dd579f2c1695 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 May 2022 14:42:31 +0200
Subject: [statistics] Fix displaying CPU core/thread info

---
 modules-available/statistics/pages/machine.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules-available/statistics/pages')

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;
-- 
cgit v1.2.3-55-g7522