Skip to content

O
OpnSense
Commit 51758409 authored by Jos Schellevis's avatar Jos Schellevis
Browse files
Options

WIP cleanup system information widget and us json with ajax calls... so much nicer

parent 84684f08
Show whitespace changes
Inline Side-by-side
Showing with 389 additions and 39 deletions
src/opnsense/scripts/pkg_updatecheck.sh
View file @ 51758409
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# USAGE: # USAGE:
# Add this file to a CRON job to check for pakcage updates regularly # Add this file to a CRON job to check for package updates regularly
# #
# This script generates a json structured file with the following content: # This script generates a json structured file with the following content:
# connection: error|ok # connection: error|ok
...@@ -80,8 +80,7 @@ if [ "$pkg_running" == "" ]; then ...@@ -80,8 +80,7 @@ if [ "$pkg_running" == "" ]; then
repository="ok" repository="ok"
# Now check if there are upgrades # Now check if there are upgrades
pkg upgrade -n > $tmp_pkg_output_file pkg upgrade -n > $tmp_pkg_output_file
updates=`cat $tmp_pkg_output_file | grep 'The following' | awk -F '[ ]' '{print $3}'` # > /tmp/pkg_upgrades.output updates=`cat $tmp_pkg_output_file | grep 'The following' | awk -F '[ ]' '{print $3}'`
#updates=`cat /tmp/pkg_upgrades.output | grep 'The following' | awk -F '[ ]' '{print $3}'`
if [ "$updates" == "" ]; then if [ "$updates" == "" ]; then
# There are no updates # There are no updates
updates="0" updates="0"
...@@ -148,7 +147,7 @@ if [ "$pkg_running" == "" ]; then ...@@ -148,7 +147,7 @@ if [ "$pkg_running" == "" ]; then
itemcount=`echo $linecount + 4 | bc` itemcount=`echo $linecount + 4 | bc`
fi fi
done done
if [ "$opnsense_core_update" == "" ]; then if [ "$core_version" == "" ]; then
core_version="current" core_version="current"
fi fi
fi fi
...@@ -158,7 +157,7 @@ if [ "$pkg_running" == "" ]; then ...@@ -158,7 +157,7 @@ if [ "$pkg_running" == "" ]; then
killall pkg killall pkg
fi fi
last_check=`date` last_check=`date`
echo "{\"connection\":\"$connection\"},{\"repository\":\"$repository\"},{\"last_check\":,\"$last_check\"},{\"updates\":\"$updates\"},{\"core_version\":\"$core_version\"},{\"download_size\":\"$download_size\"},{\"extra_space_required\":\"$required_space\"},{\"new_packages\":[$packages_new]},{\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output
else else
# pkg is already running, quitting # pkg is already running, quitting
fi fi
src/www/widgets/widgets/system_information.widget.php
View file @ 51758409
...@@ -37,45 +37,31 @@ require_once('notices.inc'); ...@@ -37,45 +37,31 @@ require_once('notices.inc');
include_once("includes/functions.inc.php"); include_once("includes/functions.inc.php");
require_once("script/load_phalcon.php"); require_once("script/load_phalcon.php");
/* Check for updates on /tmp/pkg_* files, generated by */ $file_pkg_status="/tmp/pkg_status.json";
$file_connection="/tmp/pkg_connection_issue";
$file_repository="/tmp/pkg_repository.error";
$file_updates="/tmp/pkg_updates.available";
$file_newcore_version="/tmp/pkg_core_update.available";
$file_last_check="/tmp/pkg_last.check";
$update_text="(update in 10 seconds)";
if($_POST['action'] == 'pkg_update') {
if($_POST['action'] == 'call_this') {
/* Setup Shell variables */ /* Setup Shell variables */
$shell_output = array(); $shell_output = array();
$shell = new Core\Shell(); $shell = new Core\Shell();
// execute shell command and collect (only valid) info into named array // execute shell command and collect (only valid) info into named array
if ($shell->exec("/usr/local/opnsense/scripts/pkg_updates.sh&",false,false,$shell_output) == 0 ) $shell->exec("/usr/local/opnsense/scripts/pkg_updatecheck.sh",false,false,$shell_output);
{
// Aplication done
}
} }
if($_REQUEST['getupdatestatus']) { if($_REQUEST['getupdatestatus']) {
if (file_exists($file_connection)) { if (file_exists($file_pkg_status)) {
/* There is an connection issue, repository can not be reached */
$update_text="<div class='text-danger'>Connection error</div><a href='' onclick='checkupdate()'>Click to retry now</a>"; $json = file_get_contents($file_pkg_status);
} elseif (file_exists($file_repository)) { $pkg_status = json_decode($json,true);
/* The repository is not corect */
$update_text="<div class='text-danger'>Repository error</div><a href='' onclick='checkupdate()'>Click to retry now</a>"; if ($pkg_status["updates"]=="0") {
} elseif (file_exists($file_updates)) { echo "Last check at (".$pkg_status["last_check"]."), you where up to date";
/* There are updates available */
$updates=file_get_contents($file_updates);
$update_text="<div class='text-info'>There are <b>".$updates."</b> update(s) available</div><a href='/system_firmware.php'> Click to update </a>";
} elseif (file_exists($file_last_check)) {
$last_check=file_get_contents($file_last_check);
$update_text="<div class='text-info'>No updates found (checked once a day) </div><div class='text-info'>last time on: ".$last_check."</div><a href='' onclick='checkupdate()'>Click to check now</a>" ;
} else { } else {
$update_text="<div class='text-info'>Daily cron has not yet run</div><a href='' onclick='checkupdate()'>Click here to try now</a>"; echo "<span class='text-danger'>A total of ".$pkg_status["updates"]." update(s) are available.</span>";
}
} else {
echo "Unknown<span class='btn-link' onclick='checkupdate()'>Click to check now</span>";
} }
echo $update_text;
exit; exit;
} }
...@@ -131,8 +117,7 @@ $filesystems = get_mounted_filesystems(); ...@@ -131,8 +117,7 @@ $filesystems = get_mounted_filesystems();
Updates Updates
</td> </td>
<td> <td>
<div id='updatestatus'><?php echo $update_text; ?></div> <div id='updatestatus'><span class="text-info">Fetching status</span></div>
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
...@@ -327,16 +312,22 @@ $filesystems = get_mounted_filesystems(); ...@@ -327,16 +312,22 @@ $filesystems = get_mounted_filesystems();
jQuery('#uname').html("<?php echo php_uname("a"); ?>"); jQuery('#uname').html("<?php echo php_uname("a"); ?>");
} }
function checkupdate() { function checkupdate() {
jQuery('#updatestatus').html('<span class="text-info">Updating.... (takes about 10 seconds) </span>');
jQuery.ajax({ jQuery.ajax({
type: "POST", type: "POST",
url: '/widgets/widgets/system_information.widget.php', url: '/widgets/widgets/system_information.widget.php',
data:{action:'call_this'}, data:{action:'pkg_update'},
success:function(html) { success:function(html) {
alert(html); //alert(html);
getstatus();
} }
}); });
} }
window.onload = function(){
getstatus();
}
<?php if(!isset($config['system']['firmware']['disablecheck'])): ?> <?php if(!isset($config['system']['firmware']['disablecheck'])): ?>
function getstatus() { function getstatus() {
scroll(0,0); scroll(0,0);
...@@ -355,7 +346,6 @@ $filesystems = get_mounted_filesystems(); ...@@ -355,7 +346,6 @@ $filesystems = get_mounted_filesystems();
// to avoid this we set the innerHTML property // to avoid this we set the innerHTML property
jQuery('#updatestatus').prop('innerHTML',transport.responseText); jQuery('#updatestatus').prop('innerHTML',transport.responseText);
} }
setTimeout('getstatus()', 10000); // Update after 10 seconds
<?php endif; ?> <?php endif; ?>
//]]> //]]>
</script> </script>
src/www/widgets/widgets/system_information.widget.php.backup 0 → 100644
View file @ 51758409
<?php
/*
$Id$
Copyright 2007 Scott Dale
Part of pfSense widgets (https://www.pfsense.org)
originally based on m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
and Jonathan Watt <jwatt@jwatt.org>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("functions.inc");
require_once("guiconfig.inc");
require_once('notices.inc');
include_once("includes/functions.inc.php");
require_once("script/load_phalcon.php");
/* Check for updates on /tmp/pkg_* files, generated by */
$file_connection="/tmp/pkg_connection_issue";
$file_repository="/tmp/pkg_repository.error";
$file_updates="/tmp/pkg_updates.available";
$file_newcore_version="/tmp/pkg_core_update.available";
$file_last_check="/tmp/pkg_last.check";
$update_text="(update in 10 seconds)";
if($_POST['action'] == 'call_this') {
/* Setup Shell variables */
$shell_output = array();
$shell = new Core\Shell();
// execute shell command and collect (only valid) info into named array
if ($shell->exec("/usr/local/opnsense/scripts/pkg_updates.sh&",false,false,$shell_output) == 0 )
{
// Aplication done
}
}
if($_REQUEST['getupdatestatus']) {
if (file_exists($file_connection)) {
/* There is an connection issue, repository can not be reached */
$update_text="<div class='text-danger'>Connection error</div><a href='' onclick='checkupdate()'>Click to retry now</a>";
} elseif (file_exists($file_repository)) {
/* The repository is not corect */
$update_text="<div class='text-danger'>Repository error</div><a href='' onclick='checkupdate()'>Click to retry now</a>";
} elseif (file_exists($file_updates)) {
/* There are updates available */
$updates=file_get_contents($file_updates);
$update_text="<div class='text-info'>There are <b>".$updates."</b> update(s) available</div><a href='/system_firmware.php'> Click to update </a>";
} elseif (file_exists($file_last_check)) {
$last_check=file_get_contents($file_last_check);
$update_text="<div class='text-info'>No updates found (checked once a day) </div><div class='text-info'>last time on: ".$last_check."</div><a href='' onclick='checkupdate()'>Click to check now</a>" ;
} else {
$update_text="<div class='text-info'>Daily cron has not yet run</div><a href='' onclick='checkupdate()'>Click here to try now</a>";
}
echo $update_text;
exit;
}
$curcfg = $config['system']['firmware'];
$filesystems = get_mounted_filesystems();
?>
<script type="text/javascript">
//<![CDATA[
jQuery(function() {
jQuery("#statePB").css( { width: '<?php echo get_pfstate(true); ?>%' } );
jQuery("#mbufPB").css( { width: '<?php echo get_mbuf(true); ?>%' } );
jQuery("#cpuPB").css( { width:0 } );
jQuery("#memUsagePB").css( { width: '<?php echo mem_usage(); ?>%' } );
<?PHP $d = 0; ?>
<?PHP foreach ($filesystems as $fs): ?>
jQuery("#diskUsagePB<?php echo $d++; ?>").css( { width: '<?php echo $fs['percent_used']; ?>%' } );
<?PHP endforeach; ?>
<?php if($showswap == true): ?>
jQuery("#swapUsagePB").css( { width: '<?php echo swap_usage(); ?>%' } );
<?php endif; ?>
<?php if (get_temp() != ""): ?>
jQuery("#tempPB").css( { width: '<?php echo get_temp(); ?>%' } );
<?php endif; ?>
});
//]]>
</script>
<table class="table table-striped">
<tbody>
<tr>
<td width="25%" class="vncellt"><?=gettext("Name");?></td>
<td width="75%" class="listr"><?php echo $config['system']['hostname'] . "." . $config['system']['domain']; ?></td>
</tr>
<tr>
<td width="25%" valign="top" class="vncellt"><?=gettext("Version");?></td>
<td width="75%" class="listr">
<strong><?php readfile("/usr/local/etc/version"); ?></strong>
(<?php echo php_uname("m"); ?>)
<?php if(!$g['hideuname']): ?>
<br />
<div id="uname"><a href="#" onclick='swapuname(); return false;'><?php echo php_uname("s") . " " . php_uname("r"); ?></a></div>
<?php endif; ?>
</td>
</tr>
<?php if(!isset($config['system']['firmware']['disablecheck'])): ?>
<tr>
<td>
Updates
</td>
<td>
<div id='updatestatus'><?php echo $update_text; ?></div>
</td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Platform");?></td>
<td width="75%" class="listr">
<?=htmlspecialchars($g['platform'] == 'pfSense' ? 'OPNsense' : $g['platform']); /* Platform should not be used as product name */?>
<?php if (($g['platform'] == "nanobsd") && (file_exists("/etc/nanosize.txt"))) {
echo " (" . htmlspecialchars(trim(file_get_contents("/etc/nanosize.txt"))) . ")";
} ?>
</td>
</tr>
<?php if ($g['platform'] == "nanobsd"): ?>
<?
global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
nanobsd_detect_slice_info();
$rw = is_writable("/") ? "(rw)" : "(ro)";
?>
<tr>
<td width="25%" class="vncellt"><?=gettext("NanoBSD Boot Slice");?></td>
<td width="75%" class="listr">
<?=htmlspecialchars(nanobsd_friendly_slice_name($BOOT_DEVICE));?> / <?=htmlspecialchars($BOOTFLASH);?> <?php echo $rw; ?>
<?php if ($BOOTFLASH != $ACTIVE_SLICE): ?>
<br /><br />Next Boot:<br />
<?=htmlspecialchars(nanobsd_friendly_slice_name($GLABEL_SLICE));?> / <?=htmlspecialchars($ACTIVE_SLICE);?>
<?php endif; ?>
</td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("CPU Type");?></td>
<td width="75%" class="listr">
<?php
echo (htmlspecialchars(get_single_sysctl("hw.model")));
?>
<div id="cpufreq"><?= get_cpufreq(); ?></div>
<?php $cpucount = get_cpu_count();
if ($cpucount > 1): ?>
<div id="cpucount">
<?= htmlspecialchars($cpucount) ?> CPUs: <?= htmlspecialchars(get_cpu_count(true)); ?></div>
<?php endif; ?>
</td>
</tr>
<?php if ($hwcrypto): ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Hardware crypto");?></td>
<td width="75%" class="listr"><?=htmlspecialchars($hwcrypto);?></td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Uptime");?></td>
<td width="75%" class="listr" id="uptime"><?= htmlspecialchars(get_uptime()); ?></td>
</tr>
<tr>
<td width="25%" class="vncellt"><?=gettext("Current date/time");?></td>
<td width="75%" class="listr">
<div id="datetime"><?= date("D M j G:i:s T Y"); ?></div>
</td>
</tr>
<tr>
<td width="30%" class="vncellt"><?=gettext("DNS server(s)");?></td>
<td width="70%" class="listr">
<?php
$dns_servers = get_dns_servers();
foreach($dns_servers as $dns) {
echo "{$dns}<br />";
}
?>
</td>
</tr>
<?php if ($config['revision']): ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Last config change");?></td>
<td width="75%" class="listr"><?= htmlspecialchars(date("D M j G:i:s T Y", intval($config['revision']['time'])));?></td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("State table size");?></td>
<td width="75%" class="listr">
<?php $pfstatetext = get_pfstate();
$pfstateusage = get_pfstate(true);
?>
<div class="progress">
<div id="statePB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"></span>
</div>
</div>
<span id="pfstateusagemeter"><?= $pfstateusage.'%'; ?></span> (<span id="pfstate"><?= htmlspecialchars($pfstatetext); ?></span>)
<br />
<a href="diag_dump_states.php"><?=gettext("Show states");?></a>
</td>
</tr>
<tr>
<td width="25%" class="vncellt"><?=gettext("MBUF Usage");?></td>
<td width="75%" class="listr">
<?php
$mbufstext = get_mbuf();
$mbufusage = get_mbuf(true);
?>
<div class="progress">
<div id="mbufPB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"></span>
</div>
</div>
<span id="mbufusagemeter"><?= $mbufusage.'%'; ?></span> (<span id="mbuf"><?= $mbufstext ?></span>)
</td>
</tr>
<?php if (get_temp() != ""): ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Temperature");?></td>
<td width="75%" class="listr">
<?php $TempMeter = $temp = get_temp(); ?>
<div class="progress">
<div id="tempPB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"></span>
</div>
</div>
<span id="tempmeter"><?= $temp."&#176;C"; ?></span>
</td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Load average");?></td>
<td width="75%" class="listr">
<div id="load_average" title="Last 1, 5 and 15 minutes"><?= get_load_average(); ?></div>
</td>
</tr>
<tr>
<td width="25%" class="vncellt"><?=gettext("CPU usage");?></td>
<td width="75%" class="listr">
<div class="progress">
<div id="cpuPB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"></span>
</div>
</div>
<span id="cpumeter">(Updating in 10 seconds)</span>
</td>
</tr>
<tr>
<td width="25%" class="vncellt"><?=gettext("Memory usage");?></td>
<td width="75%" class="listr">
<?php $memUsage = mem_usage(); ?>
<div class="progress">
<div id="memUsagePB" class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 0%;">
<span class="sr-only"></span>
</div>
</div>
<span id="memusagemeter"><?= $memUsage.'%'; ?></span> of <?= sprintf("%.0f", get_single_sysctl('hw.physmem') / (1024*1024)) ?> MB
</td>
</tr>
<?php if($showswap == true): ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("SWAP usage");?></td>
<td width="75%" class="listr">
<?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>
<span id="swapusagemeter"><?= $swapusage.'%'; ?></span> of <?= sprintf("%.0f", `/usr/sbin/swapinfo -m | /usr/bin/grep -v Device | /usr/bin/awk '{ print $2;}'`) ?> MB
</td>
</tr>
<?php endif; ?>
<tr>
<td width="25%" class="vncellt"><?=gettext("Disk usage");?></td>
<td width="75%" class="listr">
<?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>
</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'];?>
<br />
<?PHP endforeach; ?>
</td>
</tr>
</tbody>
</table>
<script type="text/javascript">
//<![CDATA[
function swapuname() {
jQuery('#uname').html("<?php echo php_uname("a"); ?>");
}
function checkupdate() {
jQuery.ajax({
type: "POST",
url: '/widgets/widgets/system_information.widget.php',
data:{action:'call_this'},
success:function(html) {
alert(html);
}
});
}
<?php if(!isset($config['system']['firmware']['disablecheck'])): ?>
function getstatus() {
scroll(0,0);
var url = "/widgets/widgets/system_information.widget.php";
var pars = 'getupdatestatus=yes';
jQuery.ajax(
url,
{
type: 'get',
data: pars,
complete: activitycallback
});
}
function activitycallback(transport) {
// .html() method process all script tags contained in responseText,
// to avoid this we set the innerHTML property
jQuery('#updatestatus').prop('innerHTML',transport.responseText);
}
setTimeout('getstatus()', 10000); // Update after 10 seconds
<?php endif; ?>
//]]>
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023