From 2a10d49b6d3c48b56a5b68f110c2edda7627d3cb Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 23 Nov 2021 23:39:43 -0700
Subject: [PATCH] Add CPU cores and load average.

---
 .../resources/dashboard/system_cpu_status.php | 197 +++++++++++-------
 1 file changed, 117 insertions(+), 80 deletions(-)

diff --git a/app/system/resources/dashboard/system_cpu_status.php b/app/system/resources/dashboard/system_cpu_status.php
index f4a07e86ca..84bd7e3844 100644
--- a/app/system/resources/dashboard/system_cpu_status.php
+++ b/app/system/resources/dashboard/system_cpu_status.php
@@ -16,94 +16,105 @@
 
 //add multi-lingual support
 	$language = new text;
-	$text = $language->get($_SESSION['domain']['language']['code'], 'core/user_settings');
+	$text = $language->get($_SESSION['domain']['language']['code'], 'app/system');
 
-//system status
+//system cpu status
 	echo "<div class='hud_box'>\n";
 
+//set the row style class names
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	//cpu usage
-	if (stristr(PHP_OS, 'Linux')) {
+//get the CPU details
+	if (PHP_OS == 'FreeBSD' || PHP_OS == 'Linux') {
+
 		$result = shell_exec('ps -A -o pcpu');
 		$percent_cpu = 0;
 		foreach (explode("\n", $result) as $value) {
 			if (is_numeric($value)) { $percent_cpu = $percent_cpu + $value; }
 		}
-		$result = trim(shell_exec("grep -P '^processor' /proc/cpuinfo"));
-		$cores = count(explode("\n", $result));
-		if ($percent_cpu > 1) { $percent_cpu = $percent_cpu / $cores; }
+		if (stristr(PHP_OS, 'Linux')) {
+			$result = trim(shell_exec("grep -P '^processor' /proc/cpuinfo"));
+			$cpu_cores = count(explode("\n", $result));
+		}
+		if ($percent_cpu > 1) { $percent_cpu = $percent_cpu / $cpu_cores; }
 		$percent_cpu = round($percent_cpu, 2);
+
+		//uptime
+		$result = shell_exec('uptime');
+		$load_average = sys_getloadavg();
+		
 	}
 
+//add half doughnut chart
+	?>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 8px'>
+		<div style='width: 175px; height: 175px; margin: 0 auto;'><canvas id='system_cpu_status_chart'></canvas></div>
+	</div>
 
-			//add half doughnut chart
-			?>
-			<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 8px'>
-				<div style='width: 175px; height: 175px; margin: 0 auto;'><canvas id='system_cpu_status_chart'></canvas></div>
-			</div>
-	
-			<script>
-				var system_cpu_status_chart_context = document.getElementById('system_cpu_status_chart').getContext('2d');
-	
-				var system_cpu_status_chart_background_color;
-				if ('<?php echo $percent_cpu; ?>' <= 50) {
-					system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][0]; ?>';
-				} else if ('<?php echo $percent_cpu; ?>' <= 70 && '<?php echo $percent_cpu; ?>' > 50) {
-					system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][1]; ?>';
-				} else if ('<?php echo $percent_cpu; ?>' > 70) {
-					system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][2]; ?>';
-				}
-	
-				const system_cpu_status_chart_data = {
-					datasets: [{
-						data: ['<?php echo $percent_cpu; ?>', 100 - '<?php echo $percent_cpu; ?>'],
-						backgroundColor: [
-							system_cpu_status_chart_background_color,
-							'<?php echo $_SESSION['dashboard']['cpu_usage_chart_sub_background_color']['text']; ?>'
-						],
-						borderColor: '<?php echo $_SESSION['dashboard']['cpu_usage_chart_border_color']['text']; ?>',
-						borderWidth: '<?php echo $_SESSION['dashboard']['cpu_usage_chart_border_width']['text']; ?>',
-						cutout: chart_cutout
-					}]
-				};
-	
-				const system_cpu_status_chart_config = {
-					type: 'doughnut',
-					data: system_cpu_status_chart_data,
-					options: {
-						responsive: true,
-						maintainAspectRatio: false,
-						circumference: 180,
-						rotation: 270,
-						plugins: {
-							chart_counter_2: {
-								chart_text: '<?php echo $percent_cpu; ?>'
-							},
-							legend: {
-								display: false,
-							},
-							tooltip: {
-								yAlign: 'bottom',
-								displayColors: false,
-							},
-							title: {
-								display: true,
-								text: '<?php echo $text['label-processor_usage']; ?>'
-							}
-						}
+	<script>
+		var system_cpu_status_chart_context = document.getElementById('system_cpu_status_chart').getContext('2d');
+
+		var system_cpu_status_chart_background_color;
+		if ('<?php echo $percent_cpu; ?>' <= 50) {
+			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][0]; ?>';
+		} else if ('<?php echo $percent_cpu; ?>' <= 70 && '<?php echo $percent_cpu; ?>' > 50) {
+			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][1]; ?>';
+		} else if ('<?php echo $percent_cpu; ?>' > 70) {
+			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][2]; ?>';
+		}
+
+		const system_cpu_status_chart_data = {
+			datasets: [{
+				data: ['<?php echo $percent_cpu; ?>', 100 - '<?php echo $percent_cpu; ?>'],
+				backgroundColor: [
+					system_cpu_status_chart_background_color,
+					'<?php echo $_SESSION['dashboard']['cpu_usage_chart_sub_background_color']['text']; ?>'
+				],
+				borderColor: '<?php echo $_SESSION['dashboard']['cpu_usage_chart_border_color']['text']; ?>',
+				borderWidth: '<?php echo $_SESSION['dashboard']['cpu_usage_chart_border_width']['text']; ?>',
+				cutout: chart_cutout
+			}]
+		};
+
+		const system_cpu_status_chart_config = {
+			type: 'doughnut',
+			data: system_cpu_status_chart_data,
+			options: {
+				responsive: true,
+				maintainAspectRatio: false,
+				circumference: 180,
+				rotation: 270,
+				plugins: {
+					chart_counter_2: {
+						chart_text: '<?php echo $percent_cpu; ?>'
 					},
-					plugins: [chart_counter_2],
-				};
-	
-				const system_cpu_status_chart = new Chart(
-					system_cpu_status_chart_context,
-					system_cpu_status_chart_config
-				);
-			</script>
-			<?php
+					legend: {
+						display: false,
+					},
+					tooltip: {
+						yAlign: 'bottom',
+						displayColors: false,
+					},
+					title: {
+						display: true,
+						text: '<?php echo $text['label-cpu_usage']; ?>'
+					}
+				}
+			},
+			plugins: [chart_counter_2],
+		};
+
+		const system_cpu_status_chart = new Chart(
+			system_cpu_status_chart_context,
+			system_cpu_status_chart_config
+		);
+	</script>
+
+<?php
+
+//show the content
 	echo "<div class='hud_details hud_box' id='hud_system_cpu_status_details'>";
 	echo "<table class='tr_hover' width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "<tr>\n";
@@ -111,21 +122,47 @@
 	echo "<th class='hud_heading' style='text-align: right;'>".$text['label-value']."</th>\n";
 	echo "</tr>\n";
 
-	//cpu usage
-		if (stristr(PHP_OS, 'Linux')) {
-			if ($percent_cpu != '') {
-				echo "<tr class='tr_link_void'>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-processor_usage']."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$percent_cpu."%</td>\n";
-				echo "</tr>\n";
-				$c = ($c) ? 0 : 1;
-			}
+	if (PHP_OS == 'FreeBSD' || PHP_OS == 'Linux') {
+		if ($percent_cpu != '') {
+			echo "<tr class='tr_link_void'>\n";
+			echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-cpu_usage']."</td>\n";
+			echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$percent_cpu."%</td>\n";
+			echo "</tr>\n";
+			$c = ($c) ? 0 : 1;
 		}
 
+		if ($cpu_cores != '') {
+			echo "<tr class='tr_link_void'>\n";
+			echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-cpu_cores']."</td>\n";
+			echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$cpu_cores."</td>\n";
+			echo "</tr>\n";
+			$c = ($c) ? 0 : 1;
+		}
+
+		echo "<tr class='tr_link_void'>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-load_average']." (1)</td>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$load_average[0]."</td>\n";
+		echo "</tr>\n";
+		$c = ($c) ? 0 : 1;
+
+		echo "<tr class='tr_link_void'>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-load_average']." (5)</td>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$load_average[1]."</td>\n";
+		echo "</tr>\n";
+		$c = ($c) ? 0 : 1;
+
+		echo "<tr class='tr_link_void'>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-load_average']." (15)</td>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'>".$load_average[2]."</td>\n";
+		echo "</tr>\n";
+		$c = ($c) ? 0 : 1;
+	}
+
 	echo "</table>\n";
 	echo "</div>";
 	$n++;
 
 	echo "<span class='hud_expander' onclick=\"$('#hud_system_cpu_status_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
 	echo "</div>\n";
+
 ?>