More stuff for system status page

1 files changed, 119 insertions, 9 deletions

diff --git a/modules/systemstatus.inc.php b/modules/systemstatus.inc.php
index c6d45812..5c670bcb 100644
--- a/modules/systemstatus.inc.php
+++ b/modules/systemstatus.inc.php
@@ -36,7 +36,7 @@ class Page_SystemStatus extends Page
 	protected function ajaxDiskStat()
 	{
 		$task = Taskmanager::submit('DiskStat');
-		$task = Taskmanager::waitComplete($task);
+		$task = Taskmanager::waitComplete($task, 3000);
 
 		if (!isset($task['data']['list']) || empty($task['data']['list'])) {
 			Taskmanager::addErrorMessage($task);
@@ -50,26 +50,136 @@ class Page_SystemStatus extends Page
 			if ($store === '<local>')
 				$storePoint = '/';
 			else
-				$storePoint = '/srv/openslx/nfs';
+				$storePoint = CONFIG_VMSTORE_DIR;
+			// Determine free space
 			foreach ($task['data']['list'] as $entry) {
-				if ($entry['mountPoint'] === $storePoint)
+				if ($entry['mountPoint'] === $storePoint) {
 					$storeUsage = array(
 						'percent' => $entry['usedPercent'],
-						'size' => Util::readableFileSize ($entry['sizeKb'] * 1024),
-						'color' => dechex(round(($entry['usedPercent'] / 100) * 15)) . dechex(round(((100 - $entry['usedPercent']) / 100) * 15)) . '4'
+						'size' => Util::readableFileSize($entry['sizeKb'] * 1024),
+						'color' => $this->usageColor($entry['usedPercent'])
 					);
-				if ($entry['mountPoint'] === '/')
+				}
+				if ($entry['mountPoint'] === '/') {
 					$systemUsage = array(
 						'percent' => $entry['usedPercent'],
-						'size' => Util::readableFileSize ($entry['sizeKb'] * 1024),
-						'color' => dechex(round(($entry['usedPercent'] / 100) * 15)) . dechex(round(((100 - $entry['usedPercent']) / 100) * 15)) . '4'
+						'size' => Util::readableFileSize($entry['sizeKb'] * 1024),
+						'color' => $this->usageColor($entry['usedPercent'])
 					);
+				}
+			}
+			// Determine if proper vm store is being used
+			if ($store === '<local>')
+				$storeError = false;
+			else
+				$storeError = 'VM-Store nicht eingebunden! Erwartet: ' . $store;
+			foreach ($task['data']['list'] as $entry) {
+				if ($entry['mountPoint'] === CONFIG_VMSTORE_DIR && $store !== $entry['fileSystem']) {
+					$storeError = 'Falscher VM-Store eingebunden! Erwartet: ' . $store . ' vorgefunden: ' . $entry['fileSystem'];
+					break;
+				} elseif ($entry['mountPoint'] === CONFIG_VMSTORE_DIR) {
+					$storeError = false;
+				}
 			}
 		}
 		echo Render::parse('systemstatus/diskstat', array(
 			'store' => $storeUsage,
-			'system' => $systemUsage
+			'system' => $systemUsage,
+			'storeError' => $storeError
 		));
 	}
 
+	protected function ajaxAddressList()
+	{
+		$task = Taskmanager::submit('LocalAddressesList');
+		$task = Taskmanager::waitComplete($task, 3000);
+
+		if (!isset($task['data']['addresses']) || empty($task['data']['addresses'])) {
+			Taskmanager::addErrorMessage($task);
+			Message::renderList();
+			return;
+		}
+
+		$sort = array();
+		$primary = Property::getServerIp();
+		foreach ($task['data']['addresses'] as &$addr) {
+			$sort[] = $addr['type'] . $addr['ip'];
+			if ($addr['ip'] === $primary)
+				$addr['primary'] = true;
+		}
+		array_multisort($sort, SORT_STRING, $task['data']['addresses']);
+		echo Render::parse('systemstatus/addresses', array(
+			'addresses' => $task['data']['addresses']
+		));
+	}
+	
+	protected function ajaxSystemInfo()
+	{
+		$cpuInfo = file_get_contents('/proc/cpuinfo');
+		$memInfo = file_get_contents('/proc/meminfo');
+		$stat = file_get_contents('/proc/stat');
+		$cpuCount = preg_match_all('/\bprocessor\s/', $cpuInfo, $out);
+		//$cpuCount = count($out);
+		$data = array(
+			'cpuCount' => $cpuCount,
+			'memTotal' => '???',
+			'memFree' => '???',
+			'swapTotal' => '???',
+			'swapUsed' => '???',
+		);
+		if (preg_match('/\bMemTotal:\s+(\d+)\s.*\bMemFree:\s+(\d+)\s.*\bBuffers:\s+(\d+)\s.*\bCached:\s+(\d+)\s.*\bSwapTotal:\s+(\d+)\s.*\bSwapFree:\s+(\d+)\s/s', $memInfo, $out)) {
+			$data['memTotal'] = Util::readableFileSize($out[1] * 1024);
+			$data['memFree'] = Util::readableFileSize(($out[2] + $out[3] + $out[4]) * 1024);
+			$data['memPercent'] = 100 - round((($out[2] + $out[3] + $out[4]) / $out[1]) * 100);
+			$data['swapTotal'] = Util::readableFileSize($out[5] * 1024);
+			$data['swapUsed'] = Util::readableFileSize(($out[5] - $out[6]) * 1024);
+			$data['swapPercent'] = 100 - round(($out[6] / $out[5]) * 100);
+			$data['swapWarning'] = ($data['swapPercent'] > 50 || ($out[5] - $out[6]) > 100000);
+		}
+		if (preg_match('/\bcpu\s+(?<user>\d+)\s+(?<nice>\d+)\s+(?<system>\d+)\s+(?<idle>\d+)\s+(?<iowait>\d+)\s+(?<irq>\d+)\s+(?<softirq>\d+)(\s|$)/', $stat, $out)) {
+			$total = $out['user'] + $out['nice'] + $out['system'] + $out['idle'] + $out['iowait'] + $out['irq'] + $out['softirq'];
+			$data['cpuLoad'] = 100 - round(($out['idle'] / $total) * 100);
+			$data['cpuSystem'] = round((($out['iowait'] + $out['irq'] + $out['softirq']) / $total) * 100);
+		}
+		echo Render::parse('systemstatus/systeminfo', $data);
+	}
+	
+	protected function ajaxServices()
+	{
+		$data = array();
+		
+		$taskId = Trigger::ldadp();
+		$status = Taskmanager::waitComplete($taskId, 10000);
+		
+		if (Taskmanager::isFailed($status)) {
+			if (isset($status['data']['messages']))
+				$data['ldadpError'] = $status['data']['messages'];
+			else
+				$data['ldadpError'] = print_r($status, true); //'Taskmanager error';
+		}
+		// TODO: Dozentenmodul, tftp, ...
+		
+		echo Render::parse('systemstatus/services', $data);
+	}
+
+	private function usageColor($percent)
+	{
+		if ($percent <= 50) {
+			$r = $b = $percent / 3;
+			$g = (100 - $percent * (50 / 80));
+		} elseif ($percent <= 70) {
+			$r = 55 + ($percent - 50) * (30 / 20);
+			$g = 60;
+			$b = 0;
+		} else {
+			$r = ($percent - 70) / 3 + 90;
+			$g = (100 - $percent) * (60 / 30);
+			$b = 0;
+		}
+		$r = dechex(round($r * 2.55));
+		$g = dechex(round($g * 2.55));
+		$b = dechex(round($b * 2.55));
+		return sprintf("%02s%02s%02s", $r, $g, $b);
+	}
+
 }