diff options
Diffstat (limited to 'modules-available/statistics/pages/machine.inc.php')
| -rw-r--r-- | modules-available/statistics/pages/machine.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/statistics/pages/machine.inc.php b/modules-available/statistics/pages/machine.inc.php index 79166cd5..d7ab788d 100644 --- a/modules-available/statistics/pages/machine.inc.php +++ b/modules-available/statistics/pages/machine.inc.php @@ -52,8 +52,9 @@ class SubPage private static function showMachine($uuid) { $client = Database::queryFirst('SELECT machineuuid, locationid, macaddr, clientip, firstseen, lastseen, logintime, lastboot, state, - mbram, live_tmpsize, live_tmpfree, live_swapsize, live_swapfree, live_memsize, live_memfree, live_cpuload, Length(position) AS hasroomplan, - kvmstate, cpumodel, id44mb, data, hostname, currentuser, currentsession, notes FROM machine WHERE machineuuid = :uuid', + mbram, live_tmpsize, live_tmpfree, live_swapsize, live_swapfree, live_memsize, live_memfree, live_cpuload, live_cputemp, + Length(position) AS hasroomplan, kvmstate, cpumodel, id44mb, data, hostname, currentuser, currentsession, notes + FROM machine WHERE machineuuid = :uuid', array('uuid' => $uuid)); if ($client === false) { Message::addError('unknown-machine', $uuid); @@ -127,7 +128,9 @@ class SubPage } if ($client['live_cpuload'] <= 100) { $client['live_cpuload_s'] = $client['live_cpuload'] . "\xe2\x80\x89%"; + $client['live_cpuidle'] = 100 - $client['live_cpuload']; } + $client['live_cputemppercent'] = max(0, min(100, 110 - $client['live_cputemp'])); $client['ramclass'] = StatisticsStyling::ramColorClass($client['mbram']); $client['kvmclass'] = StatisticsStyling::kvmColorClass($client['kvmstate']); $client['hddclass'] = StatisticsStyling::hddColorClass($client['gbtmp']); |