summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2023-09-25 15:47:05 +0200
committerSimon Rettberg2023-09-25 15:47:05 +0200
commitd98f3547e8d21b86ba25f3c4521cd3ec7777df46 (patch)
treefb5243fe863efdbc7eea846154e6244b31e4d99e
parent[statistics_reporting] Future-proof mem check :> (diff)
downloadslx-admin-d98f3547e8d21b86ba25f3c4521cd3ec7777df46.tar.gz
slx-admin-d98f3547e8d21b86ba25f3c4521cd3ec7777df46.tar.xz
slx-admin-d98f3547e8d21b86ba25f3c4521cd3ec7777df46.zip
[statistics_reporting] Report legacy VMware CPUs
-rw-r--r--modules-available/statistics_reporting/inc/queries.inc.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index e82e79a4..a7e6ce9c 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -421,6 +421,15 @@ class Queries
WHERE lastseen >= $from
GROUP BY $key");
}
+ // Legacy CPU
+ $f = Database::queryFirst("SELECT Count(*) AS `total`
+ FROM machine m
+ INNER JOIN machine_x_hw mxh USING (machineuuid)
+ INNER JOIN statistic_hw_prop hwp ON (hwp.hwid = mxh.hwid AND hwp.prop = 'vmx-legacy' AND hwp.value <> 0)
+ WHERE m.lastseen >= $from");
+ if (is_array($f)) {
+ $return['vmx-legacy'] = $f['total'];
+ }
return $return;
}