[statistics] Adapt hw-data parsing to new json format for display

10 files changed, 606 insertions, 427 deletions

diff --git a/install.php b/install.php
index 60cf9495..1737e7dc 100644
--- a/install.php
+++ b/install.php
@@ -262,7 +262,7 @@ function tableCreate($table, $structure, $fatalOnError = true)
 	if (tableExists($table)) {
 		return UPDATE_NOOP;
 	}
-	$ret = Database::exec("CREATE TABLE IF NOT EXISTS `{$table}` ( {$structure} ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+	$ret = Database::exec("CREATE TABLE IF NOT EXISTS `{$table}` ( {$structure} ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
 	if ($ret !== false) {
 		return UPDATE_DONE;
 	}
diff --git a/modules-available/statistics/api.inc.php b/modules-available/statistics/api.inc.php
index 52dbe284..a945cdf5 100644
--- a/modules-available/statistics/api.inc.php
+++ b/modules-available/statistics/api.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 if (Request::any('action') === 'test' && isLocalExecution()) {
+	$uuid = Request::any('uuid', '', 'string');
 	/*
 	error_log(HardwareInfo::getKclModifications());
 	exit;
@@ -14,8 +15,11 @@ if (Request::any('action') === 'test' && isLocalExecution()) {
 	}
 	exit;
 	*/
-	HardwareParser::parseMachine('0A5D9E23-80F4-9C43-912C-96D80AE7E80B',
-		file_get_contents('/tmp/bla.json'));
+	$data = file_get_contents('/tmp/bla.json');
+	Database::exec(
+		"UPDATE machine SET data = :data WHERE machineuuid = :uuid",
+		['uuid' => $uuid, 'data' => $data]);
+	HardwareParser::parseMachine($uuid, json_decode($data, true));
 	echo 'Kweries: ' . Database::getQueryCount();
 	exit;
 }
@@ -82,9 +86,21 @@ if ($type[0] === '~') {
 		if (!is_string($hostname) || $hostname === $ip) {
 			$hostname = '';
 		}
+		$json = false;
 		$data = Util::cleanUtf8(Request::post('json', '', 'string'));
-		$hasJson = !empty($data) && $data[0] === '{';
-		if (!$hasJson) {
+		if (!empty($data) && $data[0] === '{') {
+			$json = json_decode($data, true);
+			if (!is_array($json)) {
+				$json = false;
+			} else {
+				$json['cpu'] = [
+					'sockets' => Request::post('sockets', 0, 'int'),
+					'cores' => $realcores,
+					'threads' => Request::post('vcores', 0, 'int'),
+				];
+			}
+		}
+		if ($json === false) {
 			$data = Util::cleanUtf8(Request::post('data', '', 'string'));
 		}
 		// Prepare insert/update to machine table
@@ -143,7 +159,7 @@ if ($type[0] === '~') {
 				. ' id44mb = :id44mb,'
 				. ' live_tmpsize = 0, live_swapsize = 0, live_memsize = 0, live_cpuload = 255, live_cputemp = 0,'
 				. ' badsectors = :badsectors,'
-				. ' data = ' . ($hasJson ? ':data' : "If(Left(data, 1) = '{', data, :data)") . ','
+				. ' data = ' . ($json !== false ? ':data' : "If(Left(data, 1) = '{', data, :data)") . ','
 				. ' state = :state    '
 				. " WHERE machineuuid = :machineuuid AND state = :oldstate AND lastseen = :oldlastseen", $new);
 			if ($res === 0) {
@@ -175,8 +191,8 @@ if ($type[0] === '~') {
 			$new['locationid'] = $loc; // For Filter Event
 		}
 
-		if ($hasJson) {
-			HardwareParser::parseMachine($uuid, $data);
+		if ($json !== false) {
+			HardwareParser::parseMachine($uuid, $json);
 		}
 
 		// Check for suspicious hardware changes
diff --git a/modules-available/statistics/inc/hardwareparser.inc.php b/modules-available/statistics/inc/hardwareparser.inc.php
index 15534749..f2ebe335 100644
--- a/modules-available/statistics/inc/hardwareparser.inc.php
+++ b/modules-available/statistics/inc/hardwareparser.inc.php
@@ -6,119 +6,6 @@ class HardwareParser
 	const SIZE_LOOKUP = ['T' => 1099511627776, 'G' => 1073741824, 'M' => 1048576, 'K' => 1024, '' => 1];
 	const SI_LOOKUP = ['T' => 1000000000000, 'G' => 1000000000, 'M' => 1000000, 'K' => 1000, '' => 1];
 
-	public static function parseCpu(&$row, $data)
-	{
-		if (0 >= preg_match_all('/^(.+):\s+(\d+)$/im', $data, $out, PREG_SET_ORDER)) {
-			return;
-		}
-		foreach ($out as $entry) {
-			$row[str_replace(' ', '', $entry[1])] = $entry[2];
-		}
-	}
-
-	public static function parseDmiDecode(&$row, $data)
-	{
-		$lines = preg_split("/[\r\n]+/", $data);
-		$section = false;
-		$ramOk = false;
-		$ramForm = $ramType = $ramSpeed = $ramClockSpeed = false;
-		$ramslot = [];
-		$row['ramslotcount'] = $row['maxram'] = 0;
-		foreach ($lines as $line) {
-			if (empty($line)) {
-				continue;
-			}
-			if ($line[0] !== "\t" && $line[0] !== ' ') {
-				if (isset($ramslot['size'])) {
-					$row['ramslot'][] = $ramslot;
-					$ramslot = [];
-				}
-				$section = $line;
-				$ramOk = false;
-				if (($ramForm || $ramType) && ($ramSpeed || $ramClockSpeed)) {
-					if (isset($row['ramtype']) && !$ramClockSpeed) {
-						continue;
-					}
-					$row['ramtype'] = $ramType . ' ' . $ramForm;
-					if ($ramClockSpeed) {
-						$row['ramtype'] .= ', ' . $ramClockSpeed;
-					} elseif ($ramSpeed) {
-						$row['ramtype'] .= ', ' . $ramSpeed;
-					}
-					$ramForm = false;
-					$ramType = false;
-					$ramClockSpeed = false;
-				}
-				continue;
-			}
-			if ($section === 'Base Board Information') {
-				if (preg_match('/^\s*Product Name: +(\S.+?) *$/i', $line, $out)) {
-					$row['mobomodel'] = $out[1];
-				}
-				if (preg_match('/^\s*Manufacturer: +(\S.+?) *$/i', $line, $out)) {
-					$row['mobomanufacturer'] = $out[1];
-				}
-			} elseif ($section === 'System Information') {
-				if (preg_match('/^\s*Product Name: +(\S.+?) *$/i', $line, $out)) {
-					$row['pcmodel'] = $out[1];
-				}
-				if (preg_match('/^\s*Manufacturer: +(\S.+?) *$/i', $line, $out)) {
-					$row['pcmanufacturer'] = $out[1];
-				}
-			} elseif ($section === 'Physical Memory Array') {
-				if (!$ramOk && preg_match('/Use: System Memory/i', $line)) {
-					$ramOk = true;
-				}
-				if ($ramOk && preg_match('/^\s*Number Of Devices:\s+(\d+)\s*$/i', $line, $out)) {
-					$row['ramslotcount'] += $out[1];
-				}
-				if ($ramOk && preg_match('/^\s*Maximum Capacity:\s+(\d.+)/i', $line, $out)) {
-					$row['maxram'] += self::convertSize($out[1], 'G', false);
-				}
-			} elseif ($section === 'Memory Device') {
-				if (preg_match('/^\s*Size:\s*(.*?)\s*$/i', $line, $out)) {
-					$row['extram'] = true;
-					if (preg_match('/(\d+)\s*(\w)i?B/i', $out[1])) {
-						if (self::convertSize($out[1], 'M', false) < 35)
-							continue; // TODO: Parsing this line by line is painful. Check for other indicators, like Locator
-						$ramslot['size'] = self::convertSize($out[1], 'G');
-					} elseif (!isset($row['ramslot']) || (count($row['ramslot']) < 8 && (!isset($row['ramslotcount']) || $row['ramslotcount'] <= 8))) {
-						$ramslot['size'] = '_____';
-					}
-				}
-				if (preg_match('/^\s*Manufacturer:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
-					$ramslot['manuf'] = self::decodeJedec($out[1]);
-				}
-				if (preg_match('/^\s*Form Factor:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
-					$ramForm = $out[1];
-				}
-				if (preg_match('/^\s*Type:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
-					$ramType = $out[1];
-				}
-				if (preg_match('/^\s*Speed:\s*(\d.*?)\s*$/i', $line, $out)) {
-					$ramSpeed = $out[1];
-				}
-				if (preg_match('/^\s*Configured (?:Clock|Memory) Speed:\s*(\d.*?)\s*$/i', $line, $out)) {
-					$ramClockSpeed = $out[1];
-				}
-			} elseif ($section === 'BIOS Information') {
-				if (preg_match(',^\s*Release Date:\s*(\d{2}/\d{2}/\d{4})\s*$,i', $line, $out)) {
-					$row['biosdate'] = date('d.m.Y', strtotime($out[1]));
-				} elseif (preg_match('/^\s*BIOS Revision:\s*(.*?)\s*$/i', $line, $out)) {
-					$row['biosrevision'] = $out[1];
-				} elseif (preg_match('/^\s*Version:\s*(.*?)\s*$/i', $line, $out)) {
-					$row['biosversion'] = $out[1];
-				}
-			}
-		}
-		if (empty($row['ramslotcount']) || (isset($row['ramslot']) && $row['ramslotcount'] < count($row['ramslot']))) {
-			$row['ramslotcount'] = isset($row['ramslot']) ? count($row['ramslot']) : 0;
-		}
-		if ($row['maxram'] > 0) {
-			$row['maxram'] .= ' GiB';
-		}
-	}
-
 	const LOOKUP = ['T' => 1099511627776, 'G' => 1073741824, 'M' => 1048576, 'K' => 1024, '' => 1];
 
 	/**
@@ -151,248 +38,12 @@ class HardwareParser
 		return $val;
 	}
 
-	public static function parseHdd(&$row, $data)
-	{
-		$hdds = array();
-		// Could have more than one disk - linear scan
-		$lines = preg_split("/[\r\n]+/", $data);
-		$i = 0;
-		$mbrToMbFactor = $sectorToMbFactor = 0;
-		foreach ($lines as $line) {
-			if (preg_match('/^Disk (\S+):.* (\d+) bytes/i', $line, $out)) {
-				// --- Beginning of MBR disk ---
-				unset($hdd);
-				if ($out[2] < 10000) // sometimes vmware reports lots of 512byte disks
-					continue;
-				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
-					continue;
-				// disk total size and name
-				$mbrToMbFactor = 0; // This is != 0 for mbr
-				$sectorToMbFactor = 0; // This is != for gpt
-				$hdd = array(
-					'devid' => 'devid-' . ++$i,
-					'dev' => $out[1],
-					'sectors' => 0,
-					'size' => round($out[2] / (1024 * 1024 * 1024)),
-					'used' => 0,
-					'partitions' => array(),
-					'json' => array(),
-				);
-				$hdds[] = &$hdd;
-			} elseif (preg_match('/^Disk (\S+):\s+(\d+)\s+sectors,/i', $line, $out)) {
-				// --- Beginning of GPT disk ---
-				unset($hdd);
-				if ($out[2] < 1000) // sometimes vmware reports lots of 512byte disks
-					continue;
-				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
-					continue;
-				// disk total size and name
-				$mbrToMbFactor = 0; // This is != 0 for mbr
-				$sectorToMbFactor = 0; // This is != for gpt
-				$hdd = array(
-					'devid' => 'devid-' . ++$i,
-					'dev' => $out[1],
-					'sectors' => $out[2],
-					'size' => 0,
-					'used' => 0,
-					'partitions' => array(),
-					'json' => array(),
-				);
-				$hdds[] = &$hdd;
-			} elseif (preg_match('/^Units =.*= (\d+) bytes/i', $line, $out)) {
-				// --- MBR: Line that tells us how to interpret units for the partition lines ---
-				// Unit for start and end
-				$mbrToMbFactor = $out[1] / (1024 * 1024); // Convert so that multiplying by unit yields MiB
-			} elseif (preg_match('/^Logical sector size:\s*(\d+)/i', $line, $out)) {
-				// --- GPT: Line that tells us the logical sector size used everywhere ---
-				$sectorToMbFactor = $out[1] / (1024 * 1024);
-			} elseif (isset($hdd) && preg_match('/^First usable sector.* is (\d+)$/i', $line, $out)) {
-				// --- Some fdisk versions are messed up and report 2^32 as the sector count in the first line,
-				// but the correct value in the "last usable sector is xxxx" line below ---
-				if ($out[1] > $hdd['sectors']) {
-					$hdd['sectors'] = $out[1];
-				}
-			} elseif (isset($hdd) && $mbrToMbFactor !== 0 && preg_match(',^/dev/(\S+)\s+.*\s(\d+)[+\-]?\s+(\d+)[+\-]?\s+\d+[+\-]?\s+([0-9a-f]+)\s+(.*)$,i', $line, $out)) {
-				// --- MBR: Partition entry ---
-				// Some partition
-				$type = strtolower($out[4]);
-				if ($type === '5' || $type === 'f' || $type === '85') {
-					continue;
-				} elseif ($type === '44') {
-					$out[5] = 'OpenSLX-ID44';
-					$color = '#5c1';
-				} elseif ($type === '45') {
-					$out[5] = 'OpenSLX-ID45';
-					$color = '#0d7';
-				} elseif ($type === '82') {
-					$color = '#48f';
-				} else {
-					$color = '#e55';
-				}
-
-				$partsize = round(($out[3] - $out[2]) * $mbrToMbFactor);
-				$hdd['partitions'][] = array(
-					'id' => $out[1],
-					'name' => $out[1],
-					'size' => round($partsize / 1024, $partsize < 1024 ? 1 : 0),
-					'type' => $out[5],
-				);
-				$hdd['json'][] = array(
-					'label' => $out[1],
-					'value' => $partsize,
-					'color' => $color,
-				);
-				$hdd['used'] += $partsize;
-			} elseif (isset($hdd) && $sectorToMbFactor !== 0 && preg_match(',^\s*(\d+)\s+(\d+)[+\-]?\s+(\d+)[+\-]?\s+\S+\s+([0-9a-f]+)\s+(.*)$,i', $line, $out)) {
-				// --- GPT: Partition entry ---
-				// Some partition
-				$type = $out[5];
-				if ($type === 'OpenSLX-ID44') {
-					$color = '#5c1';
-				} elseif ($type === 'OpenSLX-ID45') {
-					$color = '#0d7';
-				} elseif ($type === 'Linux swap') {
-					$color = '#48f';
-				} else {
-					$color = '#e55';
-				}
-				$id = $hdd['devid'] . '-' . $out[1];
-				$partsize = round(($out[3] - $out[2]) * $sectorToMbFactor);
-				$hdd['partitions'][] = array(
-					'id' => $id,
-					'name' => $out[1],
-					'size' => round($partsize / 1024, $partsize < 1024 ? 1 : 0),
-					'type' => $type,
-				);
-				$hdd['json'][] = array(
-					'label' => $id,
-					'value' => $partsize,
-					'color' => $color,
-				);
-				$hdd['used'] += $partsize;
-			}
-		}
-		unset($hdd);
-		$i = 0;
-		foreach ($hdds as &$hdd) {
-			$hdd['used'] = round($hdd['used'] / 1024);
-			if ($hdd['size'] === 0 && $hdd['sectors'] !== 0) {
-				$hdd['size'] = round(($hdd['sectors'] * $sectorToMbFactor) / 1024);
-			}
-			$free = $hdd['size'] - $hdd['used'];
-			if ($hdd['size'] > 0 && ($free > 5 || ($free / $hdd['size']) > 0.1)) {
-				$hdd['partitions'][] = array(
-					'id' => 'free-id-' . $i,
-					'name' => Dictionary::translate('unused'),
-					'size' => $free,
-					'type' => '-',
-				);
-				$hdd['json'][] = array(
-					'label' => 'free-id-' . $i,
-					'value' => $free * 1024,
-					'color' => '#aaa',
-				);
-				++$i;
-			}
-			$hdd['json'] = json_encode($hdd['json']);
-		}
-		unset($hdd);
-		$row['hdds'] = &$hdds;
-	}
-
-	public static function parsePci(&$pci1, &$pci2, $data)
-	{
-		preg_match_all('/[a-f0-9:.]{7}\s+"(Class\s*)?(?<class>[a-f0-9]{4})"\s+"(?<ven>[a-f0-9]{4})"\s+"(?<dev>[a-f0-9]{4})"/is', $data, $out, PREG_SET_ORDER);
-		$NOW = time();
-		$pci = array();
-		foreach ($out as $entry) {
-			if (!isset($pci[$entry['class']])) {
-				$class = 'c.' . $entry['class'];
-				$res = PciId::getPciId('CLASS', $class);
-				if ($res === false) {
-					$pci[$entry['class']]['lookupClass'] = 'do-lookup';
-					$pci[$entry['class']]['class'] = $class;
-				} else {
-					$pci[$entry['class']]['class'] = $res;
-				}
-			}
-			$new = array(
-				'ven' => $entry['ven'],
-				'dev' => $entry['ven'] . ':' . $entry['dev'],
-			);
-			$res = PciId::getPciId('VENDOR', $new['ven']);
-			if ($res === false) {
-				$new['lookupVen'] = 'do-lookup';
-			} else {
-				$new['ven'] = $res;
-			}
-			$res = PciId::getPciId('DEVICE', $new['dev']);
-			if ($res === false) {
-				$new['lookupDev'] = 'do-lookup';
-			} else {
-				$new['dev'] = $res . ' (' . $new['dev'] . ')';
-			}
-			$pci[$entry['class']]['entries'][] = $new;
-		}
-		ksort($pci);
-		foreach ($pci as $class => $entry) {
-			if ($class === '0300' || $class === '0200' || $class === '0403') {
-				$pci1[] = $entry;
-			} else {
-				$pci2[] = $entry;
-			}
-		}
-	}
-
-	public static function parseSmartctl(&$hdds, $data)
-	{
-		$lines = preg_split("/[\r\n]+/", $data);
-		foreach ($lines as $line) {
-			if (preg_match('/^NEXTHDD=(.+)$/', $line, $out)) {
-				unset($dev);
-				foreach ($hdds as &$hdd) {
-					if ($hdd['dev'] === $out[1]) {
-						$dev = &$hdd;
-					}
-				}
-				continue;
-			}
-			if (!isset($dev)) {
-				continue;
-			}
-			if (preg_match('/^([A-Z][^:]+):\s*(.*)$/', $line, $out)) {
-				$key = preg_replace('/\s|-|_/', '', $out[1]);
-				if ($key === 'ModelNumber') {
-					$key = 'DeviceModel';
-				}
-				$dev['s_' . $key] = $out[2];
-			} elseif (preg_match('/^\s*\d+\s+(\S+)\s+\S+\s+\d+\s+\d+\s+\S+\s+\S+\s+(\d+)(\s|$)/', $line, $out)) {
-				$dev['s_' . preg_replace('/\s|-|_/', '', $out[1])] = $out[2];
-			}
-		}
-		// Format strings
-		foreach ($hdds as &$hdd) {
-			if (isset($hdd['s_PowerOnHours'])) {
-				$hdd['PowerOnTime'] = '';
-				$val = (int)str_replace('.', '', $hdd['s_PowerOnHours']);
-				if ($val > 8760) {
-					$hdd['PowerOnTime'] .= floor($val / 8760) . 'Y, ';
-					$val %= 8760;
-				}
-				if ($val > 720) {
-					$hdd['PowerOnTime'] .= floor($val / 720) . 'M, ';
-					$val %= 720;
-				}
-				if ($val > 24) {
-					$hdd['PowerOnTime'] .= floor($val / 24) . 'd, ';
-					$val %= 24;
-				}
-				$hdd['PowerOnTime'] .= $val . 'h';
-			}
-		}
-	}
-
-	private static function decodeJedec(string $string): string
+	/**
+	 * Decode JEDEC ID to according manufacturer
+	 * @param string $string
+	 * @return string
+	 */
+	public static function decodeJedec(string $string): string
 	{
 		// JEDEC ID:7F 7F 9E 00 00 00 00 00
 		if (preg_match('/JEDEC(?:\s*ID)?\s*:\s*([0-9a-f\s]+)/i', $string, $out)) {
@@ -464,7 +115,7 @@ class HardwareParser
 	 * @param int $type dmi type
 	 * @return array [ <props>, <props>, ... ]
 	 */
-	private static function getDmiHandles(array $data, int $type): array
+	public static function getDmiHandles(array $data, int $type): array
 	{
 		if (empty($data['dmidecode']))
 			return [];
@@ -532,9 +183,8 @@ class HardwareParser
 	 *
 	 * Along the way:
 	 * 1) any fields with bogus values, or values analogous to empty will get removed
-	 * 2) Any values ending in Bytes, bits or speed will be normalized
 	 */
-	private static function prepareDmiProperties(array $data): array
+	public static function prepareDmiProperties(array $data): array
 	{
 		$ret = [];
 		foreach ($data as $key => $vals) {
@@ -545,7 +195,7 @@ class HardwareParser
 			if ($val === '' || $val === 'notspecified' || $val === 'tobefilledbyoem' || $val === 'unknown'
 				|| $val === 'chassismanufacture' || $val === 'chassismanufacturer' || $val === 'chassisversion'
 				|| $val === 'chassisserialnumber' || $val === 'defaultstring' || $val === 'productname'
-				|| $val === 'manufacturer' || $val === 'systemmodel' || $val === 'fillbyoem') {
+				|| $val === 'manufacturer' || $val === 'systemmodel' || $val === 'fillbyoem' || $val === 'none') {
 				continue;
 			}
 			$val = trim($vals['values'][0] ?? '');
@@ -609,9 +259,8 @@ class HardwareParser
 		return $cache[$id];
 	}
 
-	public static function parseMachine(string $uuid, string $data)
+	public static function parseMachine(string $uuid, array $data)
 	{
-		$data = json_decode($data, true);
 		$version = $data['version'] ?? 0;
 		if ($version != 2) {
 			error_log("Received unsupported hw json v$version");
@@ -675,9 +324,14 @@ class HardwareParser
 				'Maximum Voltage'],
 			['Locator', 'Bank Locator', 'Serial Number', 'Asset Tag', 'Configured Memory Speed', 'Configured Voltage']
 		);
-		// Fake RAM slots used/total into this
+		// Fake RAM slots used/total etc. into this
 		$localMainboardExtra['Memory Slot Occupied'] = $ramModCount;
 		$localMainboardExtra['Memory Installed Capacity'] = self::convertSize($capa, 'G', true);
+		foreach (['sockets', 'cores', 'threads'] as $key) {
+			if (!isset($data['cpu'][$key]))
+				continue;
+			$localMainboardExtra['cpu-' . $key] = $data['cpu'][$key];
+		}
 		self::updateHwTypeFromDmi($uuid, $data, 2, HardwareInfo::MAINBOARD, ['Manufacturer', 'Product Name'],
 			[],
 			['Manufacturer', 'Product Name', 'Type', 'Version'],
diff --git a/modules-available/statistics/inc/hardwareparserlegacy.inc.php b/modules-available/statistics/inc/hardwareparserlegacy.inc.php
new file mode 100644
index 00000000..1bee23f9
--- /dev/null
+++ b/modules-available/statistics/inc/hardwareparserlegacy.inc.php
@@ -0,0 +1,345 @@
+<?php
+
+class HardwareParserLegacy
+{
+
+	public static function parseHdd(&$row, $data)
+	{
+		$hdds = array();
+		// Could have more than one disk - linear scan
+		$lines = preg_split("/[\r\n]+/", $data);
+		$i = 0;
+		$mbrToMbFactor = $sectorToMbFactor = 0;
+		foreach ($lines as $line) {
+			if (preg_match('/^Disk (\S+):.* (\d+) bytes/i', $line, $out)) {
+				// --- Beginning of MBR disk ---
+				unset($hdd);
+				if ($out[2] < 10000) // sometimes vmware reports lots of 512byte disks
+					continue;
+				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
+					continue;
+				// disk total size and name
+				$mbrToMbFactor = 0; // This is != 0 for mbr
+				$sectorToMbFactor = 0; // This is != for gpt
+				$hdd = array(
+					'devid' => 'devid-' . ++$i,
+					'dev' => $out[1],
+					'sectors' => 0,
+					'size' => round($out[2] / (1024 * 1024 * 1024)),
+					'used' => 0,
+					'partitions' => array(),
+					'json' => array(),
+				);
+				$hdds[] = &$hdd;
+			} elseif (preg_match('/^Disk (\S+):\s+(\d+)\s+sectors,/i', $line, $out)) {
+				// --- Beginning of GPT disk ---
+				unset($hdd);
+				if ($out[2] < 1000) // sometimes vmware reports lots of 512byte disks
+					continue;
+				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
+					continue;
+				// disk total size and name
+				$mbrToMbFactor = 0; // This is != 0 for mbr
+				$sectorToMbFactor = 0; // This is != for gpt
+				$hdd = array(
+					'devid' => 'devid-' . ++$i,
+					'dev' => $out[1],
+					'sectors' => $out[2],
+					'size' => 0,
+					'used' => 0,
+					'partitions' => array(),
+					'json' => array(),
+				);
+				$hdds[] = &$hdd;
+			} elseif (preg_match('/^Units =.*= (\d+) bytes/i', $line, $out)) {
+				// --- MBR: Line that tells us how to interpret units for the partition lines ---
+				// Unit for start and end
+				$mbrToMbFactor = $out[1] / (1024 * 1024); // Convert so that multiplying by unit yields MiB
+			} elseif (preg_match('/^Logical sector size:\s*(\d+)/i', $line, $out)) {
+				// --- GPT: Line that tells us the logical sector size used everywhere ---
+				$sectorToMbFactor = $out[1] / (1024 * 1024);
+			} elseif (isset($hdd) && preg_match('/^First usable sector.* is (\d+)$/i', $line, $out)) {
+				// --- Some fdisk versions are messed up and report 2^32 as the sector count in the first line,
+				// but the correct value in the "last usable sector is xxxx" line below ---
+				if ($out[1] > $hdd['sectors']) {
+					$hdd['sectors'] = $out[1];
+				}
+			} elseif (isset($hdd) && $mbrToMbFactor !== 0 && preg_match(',^/dev/(\S+)\s+.*\s(\d+)[+\-]?\s+(\d+)[+\-]?\s+\d+[+\-]?\s+([0-9a-f]+)\s+(.*)$,i', $line, $out)) {
+				// --- MBR: Partition entry ---
+				// Some partition
+				$type = strtolower($out[4]);
+				if ($type === '5' || $type === 'f' || $type === '85') {
+					continue;
+				} elseif ($type === '44') {
+					$out[5] = 'OpenSLX-ID44';
+					$color = '#5c1';
+				} elseif ($type === '45') {
+					$out[5] = 'OpenSLX-ID45';
+					$color = '#0d7';
+				} elseif ($type === '82') {
+					$color = '#48f';
+				} else {
+					$color = '#e55';
+				}
+
+				$partsize = round(($out[3] - $out[2]) * $mbrToMbFactor);
+				$hdd['partitions'][] = array(
+					'id' => $out[1],
+					'name' => $out[1],
+					'size' => round($partsize / 1024, $partsize < 1024 ? 1 : 0),
+					'type' => $out[5],
+				);
+				$hdd['json'][] = array(
+					'label' => $out[1],
+					'value' => $partsize,
+					'color' => $color,
+				);
+				$hdd['used'] += $partsize;
+			} elseif (isset($hdd) && $sectorToMbFactor !== 0 && preg_match(',^\s*(\d+)\s+(\d+)[+\-]?\s+(\d+)[+\-]?\s+\S+\s+([0-9a-f]+)\s+(.*)$,i', $line, $out)) {
+				// --- GPT: Partition entry ---
+				// Some partition
+				$type = $out[5];
+				if ($type === 'OpenSLX-ID44') {
+					$color = '#5c1';
+				} elseif ($type === 'OpenSLX-ID45') {
+					$color = '#0d7';
+				} elseif ($type === 'Linux swap') {
+					$color = '#48f';
+				} else {
+					$color = '#e55';
+				}
+				$id = $hdd['devid'] . '-' . $out[1];
+				$partsize = round(($out[3] - $out[2]) * $sectorToMbFactor);
+				$hdd['partitions'][] = array(
+					'id' => $id,
+					'name' => $out[1],
+					'size' => round($partsize / 1024, $partsize < 1024 ? 1 : 0),
+					'type' => $type,
+				);
+				$hdd['json'][] = array(
+					'label' => $id,
+					'value' => $partsize,
+					'color' => $color,
+				);
+				$hdd['used'] += $partsize;
+			}
+		}
+		unset($hdd);
+		$i = 0;
+		foreach ($hdds as &$hdd) {
+			$hdd['used'] = round($hdd['used'] / 1024);
+			if ($hdd['size'] === 0 && $hdd['sectors'] !== 0) {
+				$hdd['size'] = round(($hdd['sectors'] * $sectorToMbFactor) / 1024);
+			}
+			$free = $hdd['size'] - $hdd['used'];
+			if ($hdd['size'] > 0 && ($free > 5 || ($free / $hdd['size']) > 0.1)) {
+				$hdd['partitions'][] = array(
+					'id' => 'free-id-' . $i,
+					'name' => Dictionary::translate('unused'),
+					'size' => $free,
+					'type' => '-',
+				);
+				$hdd['json'][] = array(
+					'label' => 'free-id-' . $i,
+					'value' => $free * 1024,
+					'color' => '#aaa',
+				);
+				++$i;
+			}
+			$hdd['json'] = json_encode($hdd['json']);
+		}
+		unset($hdd);
+		$row['hdds'] = &$hdds;
+	}
+
+	public static function parsePci(&$pci1, &$pci2, $data)
+	{
+		preg_match_all('/[a-f0-9:.]{7}\s+"(Class\s*)?(?<class>[a-f0-9]{4})"\s+"(?<ven>[a-f0-9]{4})"\s+"(?<dev>[a-f0-9]{4})"/is', $data, $out, PREG_SET_ORDER);
+		$pci = array();
+		foreach ($out as $entry) {
+			if (!isset($pci[$entry['class']])) {
+				$class = 'c.' . $entry['class'];
+				$res = PciId::getPciId('CLASS', $class);
+				if ($res === false) {
+					$pci[$entry['class']]['lookupClass'] = 'do-lookup';
+					$pci[$entry['class']]['class'] = $class;
+				} else {
+					$pci[$entry['class']]['class'] = $res;
+				}
+			}
+			$new = array(
+				'ven' => $entry['ven'],
+				'dev' => $entry['ven'] . ':' . $entry['dev'],
+			);
+			$res = PciId::getPciId('VENDOR', $new['ven']);
+			if ($res === false) {
+				$new['lookupVen'] = 'do-lookup';
+			} else {
+				$new['ven'] = $res;
+			}
+			$res = PciId::getPciId('DEVICE', $new['dev']);
+			if ($res === false) {
+				$new['lookupDev'] = 'do-lookup';
+			} else {
+				$new['dev'] = $res . ' (' . $new['dev'] . ')';
+			}
+			$pci[$entry['class']]['entries'][] = $new;
+		}
+		ksort($pci);
+		foreach ($pci as $class => $entry) {
+			if ($class === '0300' || $class === '0200' || $class === '0403') {
+				$pci1[] = $entry;
+			} else {
+				$pci2[] = $entry;
+			}
+		}
+	}
+
+	public static function parseSmartctl(&$hdds, $data)
+	{
+		$lines = preg_split("/[\r\n]+/", $data);
+		foreach ($lines as $line) {
+			if (preg_match('/^NEXTHDD=(.+)$/', $line, $out)) {
+				unset($dev);
+				foreach ($hdds as &$hdd) {
+					if ($hdd['dev'] === $out[1]) {
+						$dev = &$hdd;
+					}
+				}
+				continue;
+			}
+			if (!isset($dev)) {
+				continue;
+			}
+			if (preg_match('/^([A-Z][^:]+):\s*(.*)$/', $line, $out)) {
+				$key = preg_replace('/\s|-|_/', '', $out[1]);
+				if ($key === 'ModelNumber') {
+					$key = 'DeviceModel';
+				}
+				$dev['s_' . $key] = $out[2];
+			} elseif (preg_match('/^\s*\d+\s+(\S+)\s+\S+\s+\d+\s+\d+\s+\S+\s+\S+\s+(\d+)(\s|$)/', $line, $out)) {
+				$dev['s_' . preg_replace('/\s|-|_/', '', $out[1])] = $out[2];
+			}
+		}
+		// Format strings
+		foreach ($hdds as &$hdd) {
+			if (isset($hdd['s_PowerOnHours'])) {
+				$hdd['PowerOnTime'] = '';
+				$val = (int)str_replace('.', '', $hdd['s_PowerOnHours']);
+				if ($val > 8760) {
+					$hdd['PowerOnTime'] .= floor($val / 8760) . 'Y, ';
+					$val %= 8760;
+				}
+				if ($val > 720) {
+					$hdd['PowerOnTime'] .= floor($val / 720) . 'M, ';
+					$val %= 720;
+				}
+				if ($val > 24) {
+					$hdd['PowerOnTime'] .= floor($val / 24) . 'd, ';
+					$val %= 24;
+				}
+				$hdd['PowerOnTime'] .= $val . 'h';
+			}
+		}
+	}
+
+	public static function parseCpu(&$row, $data)
+	{
+		if (0 >= preg_match_all('/^(.+):\s+(\d+)$/im', $data, $out, PREG_SET_ORDER)) {
+			return;
+		}
+		$tmp = [];
+		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'];
+	}
+
+	public static function parseDmiDecode(&$row, $data)
+	{
+		$lines = preg_split("/[\r\n]+/", $data);
+		$section = false;
+		$ramOk = false;
+		$ramForm = $ramType = false;
+		$ramslot = [];
+		$row['ram'] = $row['system'] = $row['mainboard'] = $row['bios'] = [];
+		$row['Memory Slot Count'] = $row['Memory Maximum Capacity'] = 0;
+		foreach ($lines as $line) {
+			if (empty($line)) {
+				continue;
+			}
+			if ($line[0] !== "\t" && $line[0] !== ' ') {
+				if (isset($ramslot['Size'])) {
+					$row['ram'][] = $ramslot;
+				}
+				$ramslot = [];
+				$section = $line;
+				$ramOk = false;
+				if ($ramForm || $ramType) {
+					if (isset($row['ramtype'])) {
+						continue;
+					}
+					$row['ramtype'] = $ramType . '-' . $ramForm;
+					$ramForm = false;
+					$ramType = false;
+				}
+				continue;
+			}
+			if ($section === 'Base Board Information') {
+				if (preg_match('/^\s*([^:]+):\s*(.*?)\s*$/i', $line, $out)
+					&& $out[2] !== 'Unknown' && $out[2] !== '' && $out[2] !== 'Not Specified') {
+					$row['mainboard'][$out[1]] = $out[2];
+				}
+			} elseif ($section === 'System Information') {
+				if (preg_match('/^\s*([^:]+):\s*(.*?)\s*$/i', $line, $out)
+					&& $out[2] !== 'Unknown' && $out[2] !== '' && $out[2] !== 'Not Specified') {
+					$row['system'][$out[1]] = $out[2];
+				}
+			} elseif ($section === 'Physical Memory Array') {
+				if (!$ramOk && preg_match('/Use: System Memory/i', $line)) {
+					$ramOk = true;
+				}
+				if ($ramOk && preg_match('/^\s*Number Of Devices:\s+(\d+)\s*$/i', $line, $out)) {
+					$row['Memory Slot Count'] += $out[1];
+				}
+				if ($ramOk && preg_match('/^\s*Maximum Capacity:\s+(\d.+)/i', $line, $out)) {
+					$row['Memory Maximum Capacity'] += HardwareParser::convertSize($out[1], 'G', false);
+				}
+			} elseif ($section === 'Memory Device') {
+				if (preg_match('/^\s*Size:\s*(.*?)\s*$/i', $line, $out)) {
+					$row['extram'] = true;
+					if (preg_match('/(\d+)\s*(\w)i?B/i', $out[1])) {
+						if (HardwareParser::convertSize($out[1], 'M', false) < 35)
+							continue; // TODO: Parsing this line by line is painful. Check for other indicators, like Locator
+						$ramslot['Size'] = HardwareParser::convertSize($out[1], 'G');
+					}
+				}
+				if (preg_match('/^\s*Manufacturer:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
+					$ramslot['Manufacturer'] = HardwareParser::decodeJedec($out[1]);
+				} elseif (preg_match('/^\s*Form Factor:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
+					$ramForm = $out[1];
+				} elseif (preg_match('/^\s*Type:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
+					$ramType = $out[1];
+				} elseif (preg_match('/^\s*Configured Memory Speed:\s*(.*?)\s*$/i', $line, $out) && $out[1] !== 'Unknown') {
+					$ramslot['Configured Clock Speed'] = $out[1];
+				} elseif (preg_match('/^\s*([^:]+):\s*(.*?)\s*$/i', $line, $out)
+						&& $out[2] !== 'Unknown' && $out[2] !== '' && $out[2] !== 'Not Specified') {
+					$ramslot[$out[1]] = $out[2];
+				}
+			} elseif ($section === 'BIOS Information') {
+				if (preg_match('/^\s*([^:]+):\s*(.*?)\s*$/i', $line, $out)
+					&& $out[2] !== 'Unknown' && $out[2] !== '' && $out[2] !== 'Not Specified') {
+					$row['bios'][$out[1]] = $out[2];
+				}
+			}
+		}
+		if (empty($row['Memory Slot Count']) || (isset($row['ramslot']) && $row['Memory Slot Count'] < count($row['ramslot']))) {
+			$row['Memory Slot Count'] = isset($row['ramslot']) ? count($row['ramslot']) : 0;
+		}
+		if ($row['Memory Maximum Capacity'] > 0) {
+			$row['Memory Maximum Capacity'] .= ' GiB';
+		}
+	}
+}
\ No newline at end of file
diff --git a/modules-available/statistics/install.inc.php b/modules-available/statistics/install.inc.php
index 1b664d04..67c00d8f 100644
--- a/modules-available/statistics/install.inc.php
+++ b/modules-available/statistics/install.inc.php
@@ -40,7 +40,7 @@ $res[] = tableCreate('machine', "
   `cpumodel` varchar(120) NOT NULL,
   `systemmodel` varchar(120) NOT NULL DEFAULT '',
   `id44mb` int(10) unsigned NOT NULL,
-  `id45mb` int(10) unsigned NOT NULL,
+  `id45mb` int(10) unsigned NOT NULL DEFAULT 0,
   `badsectors` int(10) unsigned NOT NULL,
   `data` mediumblob NOT NULL,
   `dataparsetime` int(10) unsigned NOT NULL DEFAULT 0,
@@ -346,7 +346,7 @@ if (!tableHasColumn('machine', 'dataparsetime')) {
 }
 if (!tableHasColumn('machine', 'id45mb')) {
 	$ret = Database::exec("ALTER TABLE `machine`
-		ADD COLUMN `id45mb` int(10) unsigned NOT NULL AFTER `id44mb`");
+		ADD COLUMN `id45mb` int(10) unsigned NOT NULL DEFAULT 0 AFTER `id44mb`");
 	if ($ret === false) {
 		finalResponse(UPDATE_FAILED, 'Adding id45mb column to machine table failed: ' . Database::lastError());
 	}
diff --git a/modules-available/statistics/pages/hints.inc.php b/modules-available/statistics/pages/hints.inc.php
index 5c6acfbb..278c0e26 100644
--- a/modules-available/statistics/pages/hints.inc.php
+++ b/modules-available/statistics/pages/hints.inc.php
@@ -5,19 +5,26 @@ class SubPage
 
 	public static function doPreprocess()
 	{
-
+		User::assertPermission('hints');
 	}
 
 	public static function doRender()
 	{
-		self::showMemoryUpgrade();
-		self::showMemorySlow();
-		self::showUnusedSpace();
+		$locs = User::getAllowedLocations('hints');
+		if (in_array(0, $locs)) {
+			$locs = [];
+		}
+		self::showMemoryUpgrade($locs);
+		self::showMemorySlow($locs);
+		self::showUnusedSpace($locs);
 	}
 
-	private static function showMemoryUpgrade()
+	private static function showMemoryUpgrade(array $locs)
 	{
 		$q = new HardwareQuery(HardwareInfo::MAINBOARD);
+		if (!empty($locs)) {
+			$q->addMachineWhere('locationid', 'IN', $locs);
+		}
 		$q->addLocalColumn('Memory Slot Occupied');
 		$q->addGlobalColumn('Memory Slot Count');
 		$q->addGlobalColumn('Memory Maximum Capacity');
@@ -40,9 +47,12 @@ class SubPage
 		Render::addTemplate('hints-ram-upgrade', ['list' => $list]);
 	}
 
-	private static function showMemorySlow()
+	private static function showMemorySlow(array $locs)
 	{
 		$q = new HardwareQuery(HardwareInfo::RAM_MODULE);
+		if (!empty($locs)) {
+			$q->addMachineWhere('locationid', 'IN', $locs);
+		}
 		$q->addLocalColumn('Locator');
 		$q->addLocalColumn('Bank Locator');
 		$q->addGlobalColumn('Form Factor');
@@ -57,17 +67,39 @@ class SubPage
 		Render::addTemplate('hints-ram-underclocked', ['list' => $list]);
 	}
 
-	private static function showUnusedSpace()
+	private static function showUnusedSpace(array $locs)
 	{
+		$id44 = $id45 = [];
+		// ID44
 		$q = new HardwareQuery(HardwareInfo::HDD);
+		if (!empty($locs)) {
+			$q->addMachineWhere('locationid', 'IN', $locs);
+		}
+		$q->addMachineColumn('clientip');
+		$q->addMachineColumn('hostname');
 		$q->addWhere(false, 'unused', '>', 2000000000); // 2 GB
 		$q->addMachineWhere('id44mb', '<', 20000); // 20 GB
-		$id44 = $q->query()->fetchAll();
+		foreach ($q->query()->fetchAll() as $row) {
+			$row['unused_s'] = Util::readableFileSize($row['unused']);
+			$row['id44mb_s'] = Util::readableFileSize($row['id44mb'], -1, 2);
+			$id44[] = $row;
+		}
+		// ID45
 		$q = new HardwareQuery(HardwareInfo::HDD);
+		if (!empty($locs)) {
+			$q->addMachineWhere('locationid', 'IN', $locs);
+		}
+		$q->addMachineColumn('clientip');
+		$q->addMachineColumn('hostname');
 		$q->addWhere(false, 'unused', '>', 25000000000); // 25 GB
 		$q->addMachineWhere('id44mb', '>', 20000); // 20 GB
 		$q->addMachineWhere('id45mb', '<', 20000); // 20 GB
-		$id45 = $q->query()->fetchAll();
+		foreach ($q->query()->fetchAll() as $row) {
+			$row['unused_s'] = Util::readableFileSize($row['unused']);
+			$row['id44mb_s'] = Util::readableFileSize($row['id44mb'], -1, 2);
+			$row['id45mb_s'] = Util::readableFileSize($row['id45mb'], -1, 2);
+			$id45[] = $row;
+		}
 		Render::addTemplate('hints-hdd-grow', [
 			'id44' => $id44,
 			'id45' => $id45,
diff --git a/modules-available/statistics/pages/machine.inc.php b/modules-available/statistics/pages/machine.inc.php
index f3af4f47..e1133338 100644
--- a/modules-available/statistics/pages/machine.inc.php
+++ b/modules-available/statistics/pages/machine.inc.php
@@ -135,31 +135,15 @@ class SubPage
 		$client['ramclass'] = StatisticsStyling::ramColorClass($client['mbram']);
 		$client['kvmclass'] = StatisticsStyling::kvmColorClass($client['kvmstate']);
 		$client['hddclass'] = StatisticsStyling::hddColorClass($client['gbtmp']);
-		// Parse the giant blob of data
-		if (strpos($client['data'], "\r") !== false) {
-			$client['data'] = str_replace("\r", "\n", $client['data']);
-		}
+		//
 		$hdds = array();
-		if (preg_match_all('/##### ([^#]+) #+$(.*?)^#####/ims', $client['data'] . '########', $out, PREG_SET_ORDER)) {
-			foreach ($out as $section) {
-				if ($section[1] === 'CPU') {
-					HardwareParser::parseCpu($client, $section[2]);
-				}
-				if ($section[1] === 'dmidecode') {
-					HardwareParser::parseDmiDecode($client, $section[2]);
-				}
-				if ($section[1] === 'Partition tables') {
-					HardwareParser::parseHdd($hdds, $section[2]);
-				}
-				if ($section[1] === 'PCI ID') {
-					$client['lspci1'] = $client['lspci2'] = array();
-					HardwareParser::parsePci($client['lspci1'], $client['lspci2'], $section[2]);
-				}
-				if (isset($hdds['hdds']) && $section[1] === 'smartctl') {
-					// This currently requires that the partition table section comes first...
-					HardwareParser::parseSmartctl($hdds['hdds'], $section[2]);
-				}
+		if ($client['data'][0] === '{') {
+			$json = json_decode($client['data'], true);
+			if (is_array($json)) {
+				$client += self::parseJson($uuid, $json);
 			}
+		} else {
+			self::parseLegacy($client, $hdds);
 		}
 		unset($client['data']);
 		// BIOS update check
@@ -348,6 +332,65 @@ class SubPage
 		}
 	}
 
+	private static function parseLegacy(array &$client, array &$hdds)
+	{
+		// Parse the giant blob of data
+		if (strpos($client['data'], "\r") !== false) {
+			$client['data'] = str_replace("\r", "\n", $client['data']);
+		}
+		if (preg_match_all('/##### ([^#]+) #+$(.*?)^#####/ims', $client['data'] . '########', $out, PREG_SET_ORDER)) {
+			foreach ($out as $section) {
+				if ($section[1] === 'CPU') {
+					HardwareParserLegacy::parseCpu($client, $section[2]);
+				}
+				if ($section[1] === 'dmidecode') {
+					HardwareParserLegacy::parseDmiDecode($client, $section[2]);
+				}
+				if ($section[1] === 'Partition tables') {
+					HardwareParserLegacy::parseHdd($hdds, $section[2]);
+				}
+				if ($section[1] === 'PCI ID') {
+					$client['lspci1'] = $client['lspci2'] = array();
+					HardwareParserLegacy::parsePci($client['lspci1'], $client['lspci2'], $section[2]);
+				}
+				if (isset($hdds['hdds']) && $section[1] === 'smartctl') {
+					// This currently requires that the partition table section comes first...
+					HardwareParserLegacy::parseSmartctl($hdds['hdds'], $section[2]);
+				}
+			}
+		}
+	}
+
+	private static function parseJson(string $uuid, array $json): array
+	{
+		$return = [
+			'cpu' => $json['cpu'] ?? [],
+			'ram' => array_map(function($item) {
+				return HardwareParser::prepareDmiProperties($item);
+			}, HardwareParser::getDmiHandles($json, 17)),
+		];
+		foreach ($return['ram'] as $ram) {
+			if (!empty($ram['Form Factor']) && !empty($ram['Type'])) {
+				$return['ramtype'] = $ram['Type'] . '-' . $ram['Form Factor'];
+				break;
+			}
+		}
+		$need = [
+			'bios' => 0,
+			'system' => 1,
+			'mainboard' => 2,
+		];
+		foreach ($need as $name => $id) {
+			$return[$name] = HardwareParser::prepareDmiProperties(
+				HardwareParser::getDmiHandles($json, $id)[0] ?? []);
+		}
+		$q = new HardwareQuery(HardwareInfo::MAINBOARD, $uuid);
+		$q->addGlobalColumn('Memory Maximum Capacity');
+		$q->addGlobalColumn('Memory Slot Count');
+		$return += $q->query()->fetch();
+		return $return;
+	}
+
 	private static function eventToIconName($event)
 	{
 		switch ($event) {
diff --git a/modules-available/statistics/permissions/permissions.json b/modules-available/statistics/permissions/permissions.json
index b27ca992..a5823775 100644
--- a/modules-available/statistics/permissions/permissions.json
+++ b/modules-available/statistics/permissions/permissions.json
@@ -25,5 +25,8 @@
     },
     "replace": {
         "location-aware": true
+    },
+    "hints": {
+        "location-aware": true
     }
 }
\ No newline at end of file
diff --git a/modules-available/statistics/templates/hints-hdd-grow.html b/modules-available/statistics/templates/hints-hdd-grow.html
new file mode 100644
index 00000000..dd856700
--- /dev/null
+++ b/modules-available/statistics/templates/hints-hdd-grow.html
@@ -0,0 +1,65 @@
+<h2>{{lang_hddUnused}}</h2>
+
+<p>{{lang_hddUnusedId44}}</p>
+
+<table class="table">
+	<thead>
+	<tr>
+		<th>{{lang_machine}}</th>
+		<th>{{lang_unused}}</th>
+		<th>{lang_id44size}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#id44}}
+	<tr>
+		<td>
+			<a class="slx-bold" href="?do=statistics&amp;uuid={{machineuuid}}">
+				{{hostname}}{{^hostname}}{{clientip}}{{/hostname}}
+			</a>
+			<div class="small">{{machineuuid}}</div>
+		</td>
+		<td>
+			{{unused_s}}
+		</td>
+		<td>
+			{{id44mb_s}}
+		</td>
+	</tr>
+	{{/id44}}
+	</tbody>
+</table>
+
+<p>{{lang_hddUnusedId45}}</p>
+
+<table class="table">
+	<thead>
+	<tr>
+		<th>{{lang_machine}}</th>
+		<th>{{lang_unused}}</th>
+		<th>{lang_id45size}}</th>
+		<th>{lang_id44size}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#id45}}
+	<tr>
+		<td>
+			<a class="slx-bold" href="?do=statistics&amp;uuid={{machineuuid}}">
+				{{hostname}}{{^hostname}}{{clientip}}{{/hostname}}
+			</a>
+			<div class="small">{{machineuuid}}</div>
+		</td>
+		<td>
+			{{unused_s}}
+		</td>
+		<td>
+			{{id45mb_s}}
+		</td>
+		<td>
+			{{id44mb_s}}
+		</td>
+	</tr>
+	{{/id45}}
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index 568099e0..29d63a73 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -220,11 +220,11 @@
 						<td class="text-nowrap">{{lang_cpuModel}}</td>
 						<td>
 							{{cpumodel}}
-							{{#Sockets}}
+							{{#cpu.sockets}}
 							<div class="small">
-								{{lang_sockets}}: {{Sockets}}, {{lang_cores}}: {{Realcores}}, {{lang_virtualCores}}: {{Virtualcores}}
+								{{lang_sockets}}: {{cpu.sockets}}, {{lang_cores}}: {{cpu.cores}}, {{lang_virtualCores}}: {{cpu.threads}}
 							</div>
-							{{/Sockets}}
+							{{/cpu.sockets}}
 							{{#live_cpuload_s}}
 							<div class="meter">
 								<div class="text left">{{lang_cpuload}}</div>
@@ -243,13 +243,12 @@
 					</tr>
 					<tr>
 						<td class="text-nowrap">{{lang_pcmodel}}</td>
-						<td>{{pcmodel}} ({{pcmanufacturer}})</td>
+						<td>{{system.Product Name}} ({{system.Manufacturer}})</td>
 					</tr>
 					<tr>
 						<td class="text-nowrap">{{lang_mobomodel}}</td>
-						<td>{{mobomodel}} ({{mobomanufacturer}})</td>
+						<td>{{mainboard.Product Name}} ({{mainboard.Manufacturer}})</td>
 					</tr>
-					{{#biosdate}}
 					<tr>
 						<td class="text-nowrap">
 							<div>{{lang_biosVersion}}</div>
@@ -257,19 +256,23 @@
 						</td>
 						<td class="text-nowrap">
 							<div id="bios-panel" class="pull-right"style="max-width:30%">{{{bioshtml}}}</div>
-							<div>{{biosversion}} (<b>{{biosrevision}}</b>)</div>
-							<div>{{biosdate}}</div>
+							<div>{{bios.Version}} (<b>{{bios.BIOS Revision}}</b>)</div>
+							<div>{{bios.Release Date}}</div>
 						</td>
 					</tr>
-					{{/biosdate}}
 					<tr class="{{ramclass}}">
 						<td class="text-nowrap">{{lang_ram}}</td>
 						<td>
 							<div>
 								{{gbram}}&thinsp;GiB
-								{{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
-								{{ramtype}}
+								{{#Memory Maximum Capacity}}
+								/ {{lang_maximumAbbrev}} {{Memory Maximum Capacity}}
+								{{/Memory Maximum Capacity}}
+								{{#Memory Slot Count}}
+								({{Memory Slot Count}} {{lang_slots}})
+								{{/Memory Slot Count}}
 							</div>
+							<div>{{ramtype}}</div>
 							{{#live_memsize}}
 							<div class="meter">
 								<div class="text left">{{lang_ram}}</div>
@@ -286,17 +289,27 @@
 							{{/live_swapsize}}
 						</td>
 					</tr>
-					{{#extram}}
 					<tr>
-						<td class="text-nowrap">{{lang_ramSlots}}</td>
-						<td>
-							{{ramslotcount}}:
-							{{#ramslot}}
-							[ <span title="{{manuf}}">{{size}}</span> ]
-							{{/ramslot}}
+						<td colspan="2">
+							<table class="table-responsive slx-table text-nowrap">
+							{{#ram}}
+								{{#Speed}}
+								<tr>
+									<td>
+										{{Locator}},
+										{{Bank Locator}}
+										{{^Bank Locator}}Set {{Set}}{{/Bank Locator}}
+									</td>
+									<td class="slx-bold">{{Size}}</td>
+									<td>{{#Configured Speed}}{{Configured Speed}} / {{/Configured Speed}}{{Speed}}</td>
+									<td>{{Manufacturer}}</td>
+									<td>{{Serial Number}}</td>
+								</tr>
+								{{/Speed}}
+							{{/ram}}
+							</table>
 						</td>
 					</tr>
-					{{/extram}}
 					<tr class="{{hddclass}}">
 						<td class="text-nowrap">{{lang_tempPart}}</td>
 						<td>
@@ -304,11 +317,19 @@
 									{{gbtmp}}&thinsp;GiB
 							</div>
 							{{#live_tmpsize}}
-								<div class="meter">
-									<div class="text right">{{live_tmpfree_s}} {{lang_free}}</div>
-									<div class="bar" style="width:{{live_tmppercent}}%"></div>
-								</div>
+							<div class="meter">
+								<div class="text right">{{live_tmpfree_s}} {{lang_free}}</div>
+								<div class="bar" style="width:{{live_tmppercent}}%"></div>
+							</div>
 							{{/live_tmpsize}}
+						</td>
+					</tr>
+					<tr>
+						<td class="text-nowrap">{{lang_persistentPart}}</td>
+						<td>
+							<div>
+								{{gbid45}}&thinsp;GiB
+							</div>
 							{{#live_id45size}}
 							<div class="meter">
 								<div class="text right">{{live_id45free_s}} {{lang_free}}</div>