mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-20 03:16:12 +00:00
queues: remove status_queues.php
This commit is contained in:
Franco Fichtner
parent
34e4226fae
commit
a7852604cf
@ -155,7 +155,6 @@
|
||||
</LoadBalancer>
|
||||
<NTP url="/status_ntpd.php"/>
|
||||
<OpenVPN url="/status_openvpn.php"/>
|
||||
<Queues url="/status_queues.php"/>
|
||||
<RRDGraphs VisibleName="RRD Graphs" url="/status_rrd_graph.php">
|
||||
<Settings url="/status_rrd_graph_settings.php"/>
|
||||
</RRDGraphs>
|
||||
|
||||
@ -1286,13 +1286,6 @@
|
||||
"ifstats.php*"
|
||||
]
|
||||
},
|
||||
"page-status-trafficshaper-queues": {
|
||||
"name": "WebCfg - Status: Traffic shaper: Queues page",
|
||||
"descr": "Allow access to the 'Status: Traffic shaper: Queues' page.",
|
||||
"match": [
|
||||
"status_queues.php*"
|
||||
]
|
||||
},
|
||||
"page-status-upnpstatus": {
|
||||
"name": "WebCfg - Status: UPnP Status page",
|
||||
"descr": "Allow access to the 'Status: UPnP Status' page.",
|
||||
|
||||
@ -212,7 +212,6 @@ $shortcuts['interfaces']['status'] = "status_interfaces.php";
|
||||
|
||||
$shortcuts['trafficshaper'] = array();
|
||||
$shortcuts['trafficshaper']['main'] = "firewall_shaper.php";
|
||||
$shortcuts['trafficshaper']['status'] = "status_queues.php";
|
||||
|
||||
$shortcuts['forwarder'] = array();
|
||||
$shortcuts['forwarder']['main'] = "services_dnsmasq.php";
|
||||
|
||||
@ -86,7 +86,6 @@ include("head.inc");
|
||||
<?php echo $status; ?>
|
||||
</div>
|
||||
|
||||
<div id="doneurl">
|
||||
</div>
|
||||
|
||||
<br/>
|
||||
@ -122,8 +121,6 @@ function update_data(obj) {
|
||||
} else if(result_text == "Done") {
|
||||
jQuery('#status').html('Done. The filter rules have been reloaded.');
|
||||
jQuery('#reloadinfo').css("visibility","hidden");
|
||||
jQuery('#doneurl').css("visibility","visible");
|
||||
jQuery('#doneurl').html("<p><a href='status_queues.php'>Queue Status<\/a><\/p>");
|
||||
}
|
||||
window.setTimeout('update_status_thread()', 2500);
|
||||
}
|
||||
|
||||
@ -1,311 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
Copyright (C) 2014-2015 Deciso B.V.
|
||||
Copyright (C) 2004, 2005 Scott Ullrich
|
||||
Copyright (C) 2009 Ermal Luçi
|
||||
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.
|
||||
*/
|
||||
|
||||
header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );
|
||||
header("Expires: " . gmdate( "D, j M Y H:i:s", time() ) . " GMT" );
|
||||
header("Cache-Control: no-store, no-cache, must-revalidate" ); // HTTP/1.1
|
||||
header("Cache-Control: post-check=0, pre-check=0", FALSE );
|
||||
header("Pragma: no-cache"); // HTTP/1.0
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
|
||||
class QueueStats {
|
||||
public $queuename;
|
||||
public $queuelength;
|
||||
public $pps;
|
||||
public $bandwidth;
|
||||
public $borrows;
|
||||
public $suspends;
|
||||
public $drops;
|
||||
}
|
||||
|
||||
if (!isvalidpid('/var/run/qstats.pid')) {
|
||||
/* Start in the background so we don't hang up the GUI */
|
||||
mwexec_bg('/usr/local/sbin/qstats -p /var/run/qstats.pid');
|
||||
/* Give it a moment to start up */
|
||||
sleep(1);
|
||||
}
|
||||
|
||||
$fd = @fsockopen('unix:///var/run/qstats');
|
||||
if (!$fd) {
|
||||
$error = "Something wrong happened during comunication with stat gathering";
|
||||
} else {
|
||||
$stats = "";
|
||||
while(!feof($fd))
|
||||
$stats .= fread($fd, 4096);
|
||||
fclose($fd);
|
||||
@file_put_contents('/tmp/qstats', $stats);
|
||||
$altqstats = @parse_xml_config('/tmp/qstats', array('altqstats'));
|
||||
if ($altqstats == -1)
|
||||
$error = "No queue statistics could be read.";
|
||||
}
|
||||
if ($_REQUEST['getactivity']) {
|
||||
$statistics = array();
|
||||
$bigger_stat = 0;
|
||||
$stat_type = $_REQUEST['stats'];
|
||||
/* build the queue stats. */
|
||||
foreach($altqstats['queue'] as $q) {
|
||||
statsQueues($q);
|
||||
}
|
||||
/* calculate the bigger amount of packets or bandwidth being moved through all queues. */
|
||||
if ($stat_type == "0")
|
||||
{
|
||||
foreach($statistics as $q) {
|
||||
if ($bigger_stat < $q->pps)
|
||||
$bigger_stat = $q->pps;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach($statistics as $q) {
|
||||
if ($bigger_stat < $q->bandwidth)
|
||||
$bigger_stat = $q->bandwidth;
|
||||
}
|
||||
}
|
||||
$finscript = "";
|
||||
foreach($statistics as $q) {
|
||||
if ($stat_type == "0")
|
||||
$packet_s = round(150 * (1 - $q->pps / $bigger_stat), 0);
|
||||
else
|
||||
$packet_s = round(150 * (1 - $q->bandwidth / $bigger_stat), 0);
|
||||
if ($packet_s < 0) {$packet_s = 0;}
|
||||
$finscript .= "jQuery('#queue{$q->queuename}widthb').width('{$packet_s}');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}widtha').width('" . (150 - $packet_s) . "');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}pps').val('" . number_format($q->pps,1) . "');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}bps').val('" . format_bits($q->bandwidth) . "');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}borrows').val('{$q->borrows}');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}suspends').val('{$q->suspends}');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}drops').val('{$q->drops}');";
|
||||
$finscript .= "jQuery('#queue{$q->queuename}length').val('{$q->queuelength}');";
|
||||
}
|
||||
unset($statistics, $altqstats);
|
||||
header("Content-type: text/javascript");
|
||||
echo $finscript;
|
||||
exit;
|
||||
}
|
||||
$pgtitle = array(gettext("Status"),gettext("Traffic shaper"),gettext("Queues"));
|
||||
$shortcut_section = "trafficshaper";
|
||||
include("head.inc");
|
||||
?>
|
||||
<body>
|
||||
<?php include("fbegin.inc"); ?>
|
||||
|
||||
|
||||
<section class="page-content-main">
|
||||
<div class="container-fluid">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<section class="col-xs-12">
|
||||
<div class="content-box">
|
||||
|
||||
<?php if(!is_array($config['shaper']['queue']) || count($config['shaper']['queue']) < 1): ?>
|
||||
<header class="content-box-head container-fluid">
|
||||
<h3><?php echo gettext("Traffic shaping is not configured."); ?></h3>
|
||||
</header>
|
||||
|
||||
<? elseif ($error): ?>
|
||||
<header class="content-box-head container-fluid">
|
||||
<h3><?php echo $error; ?></h3>
|
||||
</header>
|
||||
|
||||
<? else: ?>
|
||||
<form action="status_queues.php" method="post">
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
function getqueueactivity() {
|
||||
var url = "/status_queues.php";
|
||||
var pars = "getactivity=yes&stats=" + jQuery("#selStatistic").val();
|
||||
jQuery.ajax(
|
||||
url,
|
||||
{
|
||||
type: 'post',
|
||||
data: pars,
|
||||
complete: activitycallback
|
||||
});
|
||||
}
|
||||
function activitycallback(transport) {
|
||||
setTimeout('getqueueactivity()', 5100);
|
||||
}
|
||||
jQuery(document).ready(function(){
|
||||
setTimeout('getqueueactivity()', 150);
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
<div class="content-box-main col-xs-12">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-sort sortable">
|
||||
<tr>
|
||||
<td class="listhdr"><?=gettext("Queue"); ?></td>
|
||||
<td class="listhdr">
|
||||
<?=gettext("Statistics"); ?>
|
||||
<select id="selStatistic">
|
||||
<option value="0">PPS</option>
|
||||
<option value="1">Bandwidth</option>
|
||||
</select>
|
||||
</td>
|
||||
<td class="listhdr" width="1%"><?=gettext("PPS"); ?></td>
|
||||
<td class="listhdr" width="1%"><?=gettext("Bandwidth"); ?></td>
|
||||
<td class="listhdr" width="1%"><?=gettext("Borrows"); ?></td>
|
||||
<td class="listhdr" width="1%"><?=gettext("Suspends"); ?></td>
|
||||
<td class="listhdr" width="1%"><?=gettext("Drops"); ?></td>
|
||||
<td class="listhdr" width="1%"><?=gettext("Length"); ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
$if_queue_list = get_configured_interface_list_by_realif(false, true);
|
||||
processQueues($altqstats, 0, "")?>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br />
|
||||
<?=gettext("Queue graphs take 5 seconds to sample data"); ?>.<br />
|
||||
<?=gettext("You can configure the Traffic Shaper"); ?> <a href="/firewall_shaper_wizards.php"><?=gettext("here"); ?></a>.
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<? endif; ?>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
function StatsShowHide(classname) {
|
||||
var firstrow = jQuery("." + classname).first();
|
||||
if (firstrow.is(':visible')) {
|
||||
jQuery("." + classname).hide();}
|
||||
else {
|
||||
jQuery("." + classname).show();}
|
||||
}
|
||||
//]]>
|
||||
</script>
|
||||
<?php include("foot.inc"); ?>
|
||||
|
||||
<?php
|
||||
function processQueues($altqstats, $level, $parent_name){
|
||||
global $g;
|
||||
global $if_queue_list;
|
||||
$gray_value = 190 + $level * 10;
|
||||
if ($gray_value > 250) $gray_value = 255;
|
||||
$row_background = str_repeat(dechex($gray_value), 3);
|
||||
$parent_name = $parent_name . " queuerow" . $altqstats['name'] . $altqstats['interface'];
|
||||
$prev_if = $altqstats['interface'];
|
||||
foreach ($altqstats['queue'] as $q) {
|
||||
$if_name = "";
|
||||
foreach ($if_queue_list as $oif => $real_name) {
|
||||
if ($oif == $q['interface']) {
|
||||
$if_name = $real_name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($prev_if != $q['interface']) {
|
||||
echo "<tr><td colspan=\"8\" style=\"padding: 2px;\"><b>Interface ". htmlspecialchars(convert_real_interface_to_friendly_descr($q['interface'])) . "</b></td></tr>";
|
||||
$prev_if = $q['interface'];
|
||||
}
|
||||
?>
|
||||
<tr class="<?php echo $parent_name?>">
|
||||
<td bgcolor="#<?php echo $row_background?>" style="padding-left: <?php echo $level * 20?>px;">
|
||||
<font color="#000000">
|
||||
<?
|
||||
if (strstr($q['name'], "root_"))
|
||||
echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$if_name}&action=show\">Root queue</a>";
|
||||
else
|
||||
echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$q['name']}&action=show\">" . htmlspecialchars($q['name']) . "</a>";
|
||||
?>
|
||||
</font>
|
||||
</td>
|
||||
<?php
|
||||
$cpuUsage = 0;
|
||||
echo "<td class=\"nowrap\" width=\"1%\" bgcolor=\"#{$row_background}\">";
|
||||
echo "<img src='./themes/".$g['theme']."/images/misc/bar_left.gif' height='10' width='4' border='0' align='middle' alt='' />";
|
||||
echo "<img src='./themes/".$g['theme']."/images/misc/bar_blue.gif' height='10' name='queue{$q['name']}{$q['interface']}widtha' id='queue{$q['name']}{$q['interface']}widtha' width='" . $cpuUsage . "' border='0' align='middle' alt='" . htmlspecialchars($q['name']) . "' />";
|
||||
echo "<img src='./themes/".$g['theme']."/images/misc/bar_gray.gif' height='10' name='queue{$q['name']}{$q['interface']}widthb' id='queue{$q['name']}{$q['interface']}widthb' width='" . (150 - $cpuUsage) . "' border='0' align='middle' alt='" . htmlspecialchars($q['name']) . "' />";
|
||||
echo "<img src='./themes/".$g['theme']."/images/misc/bar_right.gif' height='10' width='5' border='0' align='middle' alt='' /> ";
|
||||
if (is_array($q['queue'])) {
|
||||
echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$q['name']}{$q['interface']}');return false\">+/-</a> ";
|
||||
}
|
||||
echo " </td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}pps' id='queue{$q['name']}{$q['interface']}pps' value='(" . gettext("Loading") . ")' align='left' /></td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:80px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}bps' id='queue{$q['name']}{$q['interface']}bps' value='' align='right' /></td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}borrows' id='queue{$q['name']}{$q['interface']}borrows' value='' align='right' /></td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}suspends' id='queue{$q['name']}{$q['interface']}suspends' value='' align='right' /></td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}drops' id='queue{$q['name']}{$q['interface']}drops' value='' align='right' /></td>";
|
||||
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}length' id='queue{$q['name']}{$q['interface']}length' value='' align='right' /></td>";
|
||||
?>
|
||||
</tr>
|
||||
<?php
|
||||
if (is_array($q['queue']))
|
||||
processQueues($q, $level + 1, $parent_name);
|
||||
};
|
||||
}
|
||||
function statsQueues($xml){
|
||||
global $statistics;
|
||||
|
||||
$current = new QueueStats();
|
||||
$child = new QueueStats();
|
||||
$current->queuename = $xml['name'] . $xml['interface'];
|
||||
$current->queuelength = $xml['qlength'];
|
||||
$current->pps = $xml['measured'];
|
||||
$current->bandwidth = $xml['measuredspeedint'];
|
||||
$current->borrows = intval($xml['borrows']);
|
||||
$current->suspends = intval($xml['suspends']);
|
||||
$current->drops = intval($xml['droppedpkts']);
|
||||
if (is_array($xml['queue'])) {
|
||||
foreach($xml['queue'] as $q) {
|
||||
$child = statsQueues($q);
|
||||
$current->pps += $child->pps;
|
||||
$current->bandwidth += $child->bandwidth;
|
||||
$current->borrows += $child->borrows;
|
||||
$current->suspends += $child->suspends;
|
||||
$current->drops += $child->drops;
|
||||
}
|
||||
}
|
||||
unset($child);
|
||||
$statistics[] = $current;
|
||||
return $current;
|
||||
}
|
||||
function format_bits($bits) {
|
||||
if ($bits >= 1000000000) {
|
||||
return sprintf("%.2f Gbps", $bits/1000000000);
|
||||
} else if ($bits >= 1000000) {
|
||||
return sprintf("%.2f Mbps", $bits/1000000);
|
||||
} else if ($bits >= 1000) {
|
||||
return sprintf("%.2f Kbps", $bits/1000);
|
||||
} else {
|
||||
return sprintf("%d bps", $bits);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user