mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-14 16:44:39 +00:00
(dashboard, widgets) cleanup system_information.widget.php
This commit is contained in:
Ad Schellevis
parent
df53c50692
commit
82fd7db543
@ -98,6 +98,43 @@ function system_api_kernel()
|
||||
return $result;
|
||||
}
|
||||
|
||||
function system_api_disk()
|
||||
{
|
||||
$result = array();
|
||||
$result['swap'] = array();
|
||||
$result['swap']['device'] = null;
|
||||
$result['swap']['total'] = null;
|
||||
$result['swap']['used'] = null;
|
||||
exec("/usr/sbin/swapinfo -k", $swap_info);
|
||||
foreach ($swap_info as $line) {
|
||||
if (strpos($line,'/dev/') !== false) {
|
||||
$parts = preg_split('/\s+/', $line);
|
||||
$result['swap']['device'] = $parts[0];
|
||||
$result['swap']['total'] = $parts[1];
|
||||
$result['swap']['used'] = $parts[2];
|
||||
}
|
||||
}
|
||||
|
||||
$result['devices'] = array();
|
||||
exec("/bin/df -Tht ufs,tmpfs,zfs,cd9660", $disk_info);
|
||||
foreach ($disk_info as $line) {
|
||||
if (strpos($line,'/dev/') !== false) {
|
||||
$parts = preg_split('/\s+/', $line);
|
||||
$diskItem = array();
|
||||
$diskItem['device'] = $parts[0];
|
||||
$diskItem['type'] = $parts[1];
|
||||
$diskItem['size'] = $parts[2];
|
||||
$diskItem['used'] = $parts[3];
|
||||
$diskItem['available'] = $parts[4];
|
||||
$diskItem['capacity'] = $parts[5];
|
||||
$diskItem['mountpoint'] = $parts[6];
|
||||
$result['devices'][] = $diskItem;
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* widget system data
|
||||
*/
|
||||
@ -111,6 +148,7 @@ function system_api()
|
||||
$result['date_frmt'] = date("D M j G:i:s T Y");
|
||||
$result['config'] = system_api_config();
|
||||
$result['kernel'] = system_api_kernel();
|
||||
$result['disk'] = system_api_disk();
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
@ -34,15 +34,6 @@ require_once("pfsense-utils.inc");
|
||||
require_once("system.inc");
|
||||
require_once("stats.inc");
|
||||
|
||||
## Check to see if we have a swap space,
|
||||
## if true, display, if false, hide it ...
|
||||
$swapinfo = `/usr/sbin/swapinfo`;
|
||||
if (stristr($swapinfo, '%')) {
|
||||
$showswap = true;
|
||||
} else {
|
||||
$showswap = false;
|
||||
}
|
||||
|
||||
|
||||
if (isset($_POST['getupdatestatus'])) {
|
||||
$pkg_json = trim(configd_run('firmware check'));
|
||||
@ -116,7 +107,9 @@ $filesystems = get_mounted_filesystems();
|
||||
*/
|
||||
function system_information_widget_update(sender, data)
|
||||
{
|
||||
// update cpu usage chart
|
||||
system_information_widget_cpu_update(sender, data);
|
||||
|
||||
$("#system_information_widget_cpu_type").html(data['cpu']['model'] + ' ( '+data['cpu']['cpus']+' cores )');
|
||||
var uptime_days = parseInt(moment.duration(parseInt(data['uptime']), 'seconds').asDays());
|
||||
var uptime_str = "";
|
||||
@ -147,6 +140,33 @@ $filesystems = get_mounted_filesystems();
|
||||
mem_text += parseInt(data['kernel']['memory']['total']/1024/1024) + " MB )"
|
||||
$("#system_information_widget_memory .state_text").html(mem_text);
|
||||
|
||||
|
||||
// swap usage
|
||||
if (data['disk']['swap']['used'] != "") {
|
||||
var swap_perc = parseInt(data['disk']['swap']['used'] / data['disk']['swap']['total']*100);
|
||||
$("#system_information_widget_swap .progress-bar").css("width", swap_perc + "%").attr("aria-valuenow", swap_perc + "%");
|
||||
var swap_text = swap_perc + " % " + "( " + parseInt(data['disk']['swap']['used']/1024) + "/";
|
||||
swap_text += parseInt(data['disk']['swap']['total']/1024) + " MB )"
|
||||
$("#system_information_widget_swap .state_text").html(swap_text);
|
||||
$("#system_information_widget_swap").show();
|
||||
} else {
|
||||
$("#system_information_widget_swap").hide();
|
||||
}
|
||||
|
||||
// disk usage
|
||||
counter = 0;
|
||||
$("#system_information_widget_disk .disk_devices").html("");
|
||||
data['disk']['devices'].map(function(device) {
|
||||
var html = $("#system_information_widget_disk .disk_template").html();
|
||||
html = html.replace('disk_id_sequence', 'system_information_widget_disk_'+counter);
|
||||
$("#system_information_widget_disk .disk_devices").html($("#system_information_widget_disk .disk_devices").html() + html);
|
||||
var disk_perc = device['capacity'].replace('%', '');
|
||||
$("#system_information_widget_disk_"+counter+' .progress-bar').css("width", disk_perc + "%").attr("aria-valuenow", disk_perc + "%");
|
||||
var disk_text = device['capacity'] + ' ' + device['mountpoint'] + ' ['+device['type']+'] (' + device['used'] +'/' + device['size'] + ')';
|
||||
$("#system_information_widget_disk_"+counter+" .state_text").html(disk_text);
|
||||
counter += 1;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -247,41 +267,29 @@ $filesystems = get_mounted_filesystems();
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<?php if ($showswap == true) :
|
||||
?>
|
||||
<tr>
|
||||
<tr id="system_information_widget_swap">
|
||||
<td><?=gettext("SWAP usage");?></td>
|
||||
<td>
|
||||
<?php $swapusage = swap_usage(); ?>
|
||||
<div class="progress">
|
||||
<div id="swapUsagePB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
|
||||
<span class="sr-only"></span>
|
||||
</div>
|
||||
<div class="progress" style="text-align:center;">
|
||||
<span class="state_text" style="position:absolute;right:0;left:0;z-index:200;"></span>
|
||||
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>
|
||||
</div>
|
||||
<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; ?>
|
||||
<tr>
|
||||
<td><?=gettext("Disk usage");?></td>
|
||||
<td>
|
||||
<?php $d = 0; ?>
|
||||
<?php foreach ($filesystems as $fs) : ?>
|
||||
<div class="progress">
|
||||
<div id="diskUsagePB<?php echo $d; ?>" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
|
||||
<span class="sr-only"></span>
|
||||
<td id="system_information_widget_disk">
|
||||
<div style="display:none" class="disk_template">
|
||||
<!-- template -->
|
||||
<div id="disk_id_sequence" class="progress" style="text-align:center;">
|
||||
<span class="state_text" style="position:absolute;right:0;left:0;z-index:200;"></span>
|
||||
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>
|
||||
</div>
|
||||
<div style="height:1px;">
|
||||
</div>
|
||||
</div>
|
||||
<div class="disk_devices">
|
||||
</div>
|
||||
</div>
|
||||
<?php if (substr(basename($fs['device']), 0, 5) == "tmpfs") {
|
||||
$fs['type'] .= " in RAM";
|
||||
} ?>
|
||||
<?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'];
|
||||
if ($d != count($filesystems)) {
|
||||
echo '<br/><br/>';
|
||||
}
|
||||
endforeach; ?>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user