From 8385ab853edbef6d72412ceca1ddff0b632cb545 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 29 Jan 2021 14:29:57 +0100
Subject: [statistics] Show ID45 live stats

Closes #3634
---
 modules-available/statistics/install.inc.php             | 11 +++++++++++
 modules-available/statistics/pages/machine.inc.php       |  5 +++--
 modules-available/statistics/templates/machine-main.html |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules-available/statistics/install.inc.php b/modules-available/statistics/install.inc.php
index e8788224..54e844e0 100644
--- a/modules-available/statistics/install.inc.php
+++ b/modules-available/statistics/install.inc.php
@@ -297,5 +297,16 @@ if (!tableHasColumn('machine', 'currentrunmode')) {
 	$res[] = UPDATE_DONE;
 }
 
+// 2019-01-25: Add memory/temp stats column
+if (!tableHasColumn('machine', 'live_id45size')) {
+	$ret = Database::exec("ALTER TABLE `machine`
+		ADD COLUMN `live_id45size` int(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `live_tmpfree`,
+		ADD COLUMN `live_id45free` int(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `live_id45size`");
+	if ($ret === false) {
+		finalResponse(UPDATE_FAILED, 'Adding mem-stat columns to machine table failed: ' . Database::lastError());
+	}
+	$res[] = UPDATE_DONE;
+}
+
 // Create response
 responseFromArray($res);
diff --git a/modules-available/statistics/pages/machine.inc.php b/modules-available/statistics/pages/machine.inc.php
index d7ab788d..ea545b16 100644
--- a/modules-available/statistics/pages/machine.inc.php
+++ b/modules-available/statistics/pages/machine.inc.php
@@ -52,7 +52,8 @@ 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, live_cputemp,
+			mbram, live_tmpsize, live_tmpfree, live_id45size, live_id45free, 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));
@@ -120,7 +121,7 @@ class SubPage
 		}
 		$client['gbram'] = round(ceil($client['mbram'] / 512) / 2, 1);
 		$client['gbtmp'] = round($client['id44mb'] / 1024);
-		foreach (['tmp', 'swap', 'mem'] as $item) {
+		foreach (['tmp', 'id45', 'swap', 'mem'] as $item) {
 			if ($client['live_' . $item . 'size'] == 0)
 				continue;
 			$client['live_' . $item . 'percent'] = round(($client['live_' . $item . 'free'] / $client['live_' . $item . 'size']) * 100, 2);
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index 3eabf65c..568099e0 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -309,6 +309,12 @@
 									<div class="bar" style="width:{{live_tmppercent}}%"></div>
 								</div>
 							{{/live_tmpsize}}
+							{{#live_id45size}}
+							<div class="meter">
+								<div class="text right">{{live_id45free_s}} {{lang_free}}</div>
+								<div class="bar" style="width:{{live_id45percent}}%"></div>
+							</div>
+							{{/live_id45size}}
 						</td>
 					</tr>
 					<tr class="{{kvmclass}}">
-- 
cgit v1.2.3-55-g7522