From 2f719eafb15cfe0a8d10a284b0857d98cc0f89ac Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 13 Apr 2022 12:50:21 +0200 Subject: [statistics_reporting] Add GPU type counts --- .../statistics_reporting/inc/queries.inc.php | 2 +- .../statistics_reporting/inc/remotereport.inc.php | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php index 8c6ff9a8..90c43918 100644 --- a/modules-available/statistics_reporting/inc/queries.inc.php +++ b/modules-available/statistics_reporting/inc/queries.inc.php @@ -84,7 +84,7 @@ class Queries $total['sessions'] = array_merge($total['sessions'], $machine['sessions']); } } - $total['medianSessionLength'] = self::calcMedian($total['sessions']); + $total['medianSessionLength'] = $total ? self::calcMedian($total['sessions']) : 0; unset($total['sessions']); return $total; } diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php index fec78542..13daae3a 100644 --- a/modules-available/statistics_reporting/inc/remotereport.inc.php +++ b/modules-available/statistics_reporting/inc/remotereport.inc.php @@ -96,6 +96,7 @@ class RemoteReport $result['days' . $day] = $data; } $result['server'] = self::getLocalHardware(); + $result['gpus'] = self::getGpus(); } $result['version'] = CONFIG_FOOTER; return $result; @@ -138,4 +139,23 @@ class RemoteReport return $data; } + private static function getGpus() + { + + $q = new HardwareQuery(HardwareInfo::PCI_DEVICE, null, true); + $q->addGlobalColumn('vendor'); + $q->addGlobalColumn('device'); + $q->addGlobalColumn('class')->addCondition('=', '0300'); // VGA adapter + $res = $q->query(['vendor', 'device']); + $return = []; + foreach ($res as $row) { + $return[] = [ + 'group_count' => $row['group_count'], + 'device' => $row['device'], + 'vendor' => $row['vendor'], + ]; + } + return $return; + } + } -- cgit v1.2.3-55-g7522