diff options
Diffstat (limited to 'modules-available/statistics/inc/hardwareparser.inc.php')
| -rw-r--r-- | modules-available/statistics/inc/hardwareparser.inc.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules-available/statistics/inc/hardwareparser.inc.php b/modules-available/statistics/inc/hardwareparser.inc.php index f2ebe335..0217835e 100644 --- a/modules-available/statistics/inc/hardwareparser.inc.php +++ b/modules-available/statistics/inc/hardwareparser.inc.php @@ -96,7 +96,7 @@ class HardwareParser } // Count, size (unitless) if (is_numeric($val) && preg_match('/^-?[0-9]+$/', $val) - && preg_match('/used|occupied|count|number|size|temperature/', $key)) { + && preg_match('/used|occupied|count|number|size|temperature|_start|_value|_thresh|_worst|_time/', $key)) { return (int)$val; } // Date @@ -413,8 +413,8 @@ class HardwareParser 'size' => $size, 'physical_block_size' => $smart['physical_block_size'] ?? $lsblk['phy-sec'] ?? 0, 'logical_block_size' => $smart['logical_block_size'] ?? $lsblk['log-sec'] ?? 0, - ] + self::propsFromArray($smart, - 'rotation_rate', 'sata_version//string', 'interface_speed//max//string')); + ] + self::propsFromArray($smart, 'rotation_rate', 'sata_version//string', + 'interface_speed//max//string', 'model_family')); // Mangle smart attribute table // TODO: Handle used endurance indicator for (SATA) SSDs $table = []; @@ -497,10 +497,12 @@ class HardwareParser } } $table['unused'] = $size - $used; + $table['dev'] = $dev['readlink']; $table += self::propsFromArray($smart + ($lsblk ?? []), 'serial_number', 'firmware_version', 'interface_speed//current//string', - 'smart_status//passed', 'temperature//current', 'temperature//min', 'temperature//max'); + 'smart_status//passed', 'temperature//current', 'temperature//min', 'temperature//max', + 'power_on_time//hours'); $mappingId = self::writeLocalHardwareData($uuid, $hwid, $dev['readlink'], $table); // Delete old partition and smart attribute entries |