add actual memory/disc/swap usage in dashboard, feature request...

add actual memory/disc/swap usage in dashboard, feature request https://github.com/opnsense/core/issues/66

src/www/includes/functions.inc.php

@@ -192,13 +192,13 @@ function get_temp() {
 function get_mounted_filesystems() {
 	$mout = "";
 	$filesystems = array();
-	exec("/bin/df -Tht ufs,zfs,cd9660 | /usr/bin/awk '{print $1, $2, $3, $6, $7;}'", $mout);
+	exec("/bin/df -Tht ufs,zfs,cd9660 | /usr/bin/awk '{print $1, $2, $3, $4, $6, $7;}'", $mout);
 
 	/* Get rid of the header */
 	array_shift($mout);
 	foreach ($mout as $fs) {
 		$f = array();
-		list($f['device'], $f['type'], $f['total_size'], $f['percent_used'], $f['mountpoint']) = explode(' ', $fs);
+		list($f['device'], $f['type'], $f['total_size'], $f['used_size'], $f['percent_used'], $f['mountpoint']) = explode(' ', $fs);
 
 		/* We dont' want the trailing % sign. */
 		$f['percent_used'] = trim($f['percent_used'], '%');
@@ -242,6 +242,7 @@ function mem_usage() {
 	return $memUsage;
 }
 
+
 function update_date_time() {
 	$datetime = date("D M j G:i:s T Y");
 	return $datetime;

src/www/widgets/widgets/system_information.widget.php

@@ -274,7 +274,7 @@ $filesystems = get_mounted_filesystems();
 				    <span class="sr-only"></span>
 				  </div>
 				</div>
-				<span id="memusagemeter"><?= $memUsage.'%'; ?></span> of <?= sprintf("%.0f", get_single_sysctl('hw.physmem') / (1024*1024)) ?> MB
+				<span id="memusagemeter"><?= $memUsage.'%'; ?></span> used <?= sprintf("%.0f/%.0f", $memUsage/100.0 * get_single_sysctl('hw.physmem') / (1024*1024)  ,get_single_sysctl('hw.physmem') / (1024*1024)) ?> MB
 			</td>
 		</tr>
 		<?php if($showswap == true): ?>
@@ -287,7 +287,7 @@ $filesystems = get_mounted_filesystems();
 				    <span class="sr-only"></span>
 				  </div>
 				</div>
-				<span id="swapusagemeter"><?= $swapusage.'%'; ?></span> of <?= sprintf("%.0f", `/usr/sbin/swapinfo -m | /usr/bin/grep -v Device | /usr/bin/awk '{ print $2;}'`) ?> MB
+				<span id="swapusagemeter"><?= $swapusage.'%'; ?></span> used <?= sprintf("%.0f/%.0f",`/usr/sbin/swapinfo -m | /usr/bin/grep -v Device | /usr/bin/awk '{ print $3;}'`, `/usr/sbin/swapinfo -m | /usr/bin/grep -v Device | /usr/bin/awk '{ print $2;}'`) ?> MB
 			</td>
 		</tr>
 		<?php endif; ?>
@@ -302,7 +302,7 @@ $filesystems = get_mounted_filesystems();
 				  </div>
 				</div>
 				<?PHP if (substr(basename($fs['device']), 0, 2) == "md") $fs['type'] .= " in RAM"; ?>
-				<?PHP echo "{$fs['mountpoint']} ({$fs['type']})";?>: <span id="diskusagemeter<?php echo $d++ ?>"><?= $fs['percent_used'].'%'; ?></span> of <?PHP echo $fs['total_size'];?>
+				<?PHP echo "{$fs['mountpoint']} ({$fs['type']})";?>: <span id="diskusagemeter<?php echo $d++ ?>"><?= $fs['percent_used'].'%'; ?></span> used <?PHP echo $fs['used_size'] ."/". $fs['total_size'];?>
 				<br />
 <?PHP endforeach; ?>
 			</td>