From 4849f69fe671ed9e60b513a69847fb7ff3145e10 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 9 Mar 2022 14:42:15 +0100
Subject: [systemstatus] Add distro and kernel version

---
 modules-available/systemstatus/lang/de/template-tags.json | 2 ++
 modules-available/systemstatus/lang/en/template-tags.json | 2 ++
 modules-available/systemstatus/page.inc.php               | 6 ++++--
 modules-available/systemstatus/templates/systeminfo.html  | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'modules-available/systemstatus')

diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json
index 6641b9e1..d9be820c 100644
--- a/modules-available/systemstatus/lang/de/template-tags.json
+++ b/modules-available/systemstatus/lang/de/template-tags.json
@@ -7,11 +7,13 @@
     "lang_capacity": "Kapazit\u00e4t",
     "lang_confirmRestart": "Diesen Dienst wirklich neustarten? Dies kann Auswirkungen auf den Betrieb haben.",
     "lang_cpuLoad": "CPU-Last",
+    "lang_distribution": "Distribution",
     "lang_dmsdUnreachable": "dmsd nicht erreichbar",
     "lang_failure": "Fehler",
     "lang_foundStore": "Vorgefunden:",
     "lang_free": "Frei",
     "lang_goToStoreConf": "Zur VM-Store-Konfiguration wechseln",
+    "lang_kernel": "Kernel",
     "lang_logicCPUs": "Logische CPUs",
     "lang_maintenance": "Maintenance",
     "lang_moduleHeading": "System-Status",
diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json
index b7f9867a..330aa1b2 100644
--- a/modules-available/systemstatus/lang/en/template-tags.json
+++ b/modules-available/systemstatus/lang/en/template-tags.json
@@ -7,11 +7,13 @@
     "lang_capacity": "Capacity",
     "lang_confirmRestart": "Are you sure you want to restart this service? This can lead to interruptions.",
     "lang_cpuLoad": "CPU Load",
+    "lang_distribution": "Distribution",
     "lang_dmsdUnreachable": "dmsd not reachable",
     "lang_failure": "Failure",
     "lang_foundStore": "Found:",
     "lang_free": "Free",
     "lang_goToStoreConf": "Go to VM store configuration",
+    "lang_kernel": "Kernel",
     "lang_logicCPUs": "Logical CPUs",
     "lang_maintenance": "Maintenance",
     "lang_moduleHeading": "System Status",
diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 238537d8..bf03112f 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -153,14 +153,16 @@ class Page_SystemStatus extends Page
 		$cpuInfo = file_get_contents('/proc/cpuinfo');
 		$uptime = file_get_contents('/proc/uptime');
 		$cpuCount = preg_match_all('/\bprocessor\s/', $cpuInfo, $out);
-		//$cpuCount = count($out);
+		$out = parse_ini_file('/etc/os-release');
 		$data = array(
 			'cpuCount' => $cpuCount,
 			'memTotal' => '???',
 			'memFree' => '???',
 			'swapTotal' => '???',
 			'swapUsed' => '???',
-			'uptime' => '???'
+			'uptime' => '???',
+			'kernel' => php_uname('r'),
+			'distribution' => $out['PRETTY_NAME'] ?? (($out['NAME'] ?? '???') . ' ' . ($out['VERSION'] ?? '???')),
 		);
 		if (preg_match('/^(\d+)\D/', $uptime, $out)) {
 			$data['uptime'] = floor($out[1] / 86400) . ' ' . Dictionary::translate('lang_days') . ', ' . floor(($out[1] % 86400) / 3600) . ' ' . Dictionary::translate('lang_hours');
diff --git a/modules-available/systemstatus/templates/systeminfo.html b/modules-available/systemstatus/templates/systeminfo.html
index cf3f0cc2..96f0ba4f 100644
--- a/modules-available/systemstatus/templates/systeminfo.html
+++ b/modules-available/systemstatus/templates/systeminfo.html
@@ -1,6 +1,6 @@
-<div>
-	{{lang_uptimeOS}}: {{uptime}}
-</div>
+<div>{{lang_uptimeOS}}: <b>{{uptime}}</b></div>
+<div>{{lang_distribution}}: <b>{{distribution}}</b></div>
+<div>{{lang_kernel}}: <b>{{kernel}}</b></div>
 
 <div class="slx-storechart">
 	<b>{{lang_cpuLoad}}</b>
-- 
cgit v1.2.3-55-g7522