mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-13 08:09:41 +00:00
system: gateway group status into main list; closes #2201
This commit is contained in:
Franco Fichtner
parent
2c9b064662
commit
854ab5a9b8
1
plist
1
plist
@ -1076,7 +1076,6 @@
|
||||
/usr/local/www/services_unbound_overrides.php
|
||||
/usr/local/www/status_dhcp_leases.php
|
||||
/usr/local/www/status_dhcpv6_leases.php
|
||||
/usr/local/www/status_gateway_groups.php
|
||||
/usr/local/www/status_graph.php
|
||||
/usr/local/www/status_habackup.php
|
||||
/usr/local/www/status_interfaces.php
|
||||
|
||||
@ -54,9 +54,9 @@
|
||||
<Edit url="/system_gateways_edit.php*" visibility="hidden"/>
|
||||
</Single>
|
||||
<Group order="20" url="/system_gateway_groups.php">
|
||||
<List url="/system_gateway_groups.php*" visibility="hidden"/>
|
||||
<Edit url="/system_gateway_groups_edit.php*" visibility="hidden"/>
|
||||
</Group>
|
||||
<GroupStatus order="21" VisibleName="Group Status" url="/status_gateway_groups.php"/>
|
||||
<Log VisibleName="Log File" order="30" url="/diag_logs_gateways.php"/>
|
||||
</Gateways>
|
||||
<Settings order="20" cssClass="fa fa-cogs fa-fw">
|
||||
|
||||
@ -512,12 +512,6 @@
|
||||
<pattern>status_dhcpv6_leases.php*</pattern>
|
||||
</patterns>
|
||||
</page-status-dhcpv6leases>
|
||||
<page-status-gatewaygroups>
|
||||
<name>Status: Gateway Groups</name>
|
||||
<patterns>
|
||||
<pattern>status_gateway_groups.php*</pattern>
|
||||
</patterns>
|
||||
</page-status-gatewaygroups>
|
||||
<page-status-interfaces>
|
||||
<name>Status: Interfaces</name>
|
||||
<patterns>
|
||||
|
||||
@ -1,141 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
Copyright (C) 2014-2015 Deciso B.V.
|
||||
Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
|
||||
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("guiconfig.inc");
|
||||
require_once("services.inc");
|
||||
|
||||
// request report data
|
||||
$a_gateway_groups = &config_read_array('gateways', 'gateway_group');
|
||||
$gateways_status = return_gateways_status(true);
|
||||
$a_gateways = return_gateways_array();
|
||||
|
||||
legacy_html_escape_form_data($a_gateways);
|
||||
legacy_html_escape_form_data($a_gateway_groups);
|
||||
|
||||
$service_hook = 'apinger';
|
||||
|
||||
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="tab-content content-box col-xs-12">
|
||||
<div class="responsive-table">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<td><?=gettext("Group Name"); ?></td>
|
||||
<td class="hidden-xs"><?=gettext("Description"); ?></td>
|
||||
<td><?=gettext("Gateways"); ?></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
foreach ($a_gateway_groups as $gateway_group):
|
||||
$priorities = array();
|
||||
foreach($gateway_group['item'] as $item) {
|
||||
$itemsplit = explode("|", $item);
|
||||
if (!isset($priorities[$itemsplit[1]])) {
|
||||
$priorities[$itemsplit[1]] = array();
|
||||
}
|
||||
if (!empty($a_gateways[$itemsplit[0]])) {
|
||||
$priorities[$itemsplit[1]][$itemsplit[0]] = $a_gateways[$itemsplit[0]];
|
||||
}
|
||||
}
|
||||
ksort($priorities);
|
||||
?>
|
||||
<tr>
|
||||
<td> <?=$gateway_group['name'];?> </td>
|
||||
<td class="hidden-xs"> <?=$gateway_group['descr'];?> </td>
|
||||
<td>
|
||||
<table class="table table-condensed">
|
||||
<?php
|
||||
foreach ($priorities as $priority => $gateways):?>
|
||||
<tr>
|
||||
<td><?=sprintf(gettext("Tier %s"), $priority);?></td>
|
||||
<td>
|
||||
<?php
|
||||
foreach ($gateways as $gname => $gateway):
|
||||
$online = gettext('Pending');
|
||||
$gateway_label_class = 'default';
|
||||
if ($gateways_status[$gname]) {
|
||||
$status = $gateways_status[$gname]['status'];
|
||||
if (stristr($status, 'force_down')) {
|
||||
$online = gettext('Offline (forced)');
|
||||
$gateway_label_class = 'danger';
|
||||
} elseif (stristr($status, 'down')) {
|
||||
$online = gettext('Offline');
|
||||
$gateway_label_class = 'danger';
|
||||
} elseif (stristr($status, 'loss')) {
|
||||
$online = gettext('Warning, Packetloss').': '.$status['loss'];
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif (stristr($status, 'delay')) {
|
||||
$online = gettext('Warning, Latency').': '.$status['delay'];
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif ($status == 'none') {
|
||||
$online = gettext('Online');
|
||||
$gateway_label_class = 'success';
|
||||
} elseif (!empty($gateway['monitor_disable'])) {
|
||||
$online = gettext('Online');
|
||||
$gateway_label_class = 'success';
|
||||
}
|
||||
}
|
||||
?>
|
||||
<div class="label label-<?= $gateway_label_class ?>" style="margin-right:4px">
|
||||
<i class="fa fa-globe"></i>
|
||||
<?=$gateway['name'];?>, <?=$online;?>
|
||||
</div>
|
||||
<?php
|
||||
endforeach;?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
endforeach; ?>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<?php
|
||||
endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<?php include("foot.inc"); ?>
|
||||
@ -34,6 +34,8 @@ require_once("services.inc");
|
||||
require_once("rrd.inc");
|
||||
|
||||
$a_gateway_groups = &config_read_array('gateways', 'gateway_group');
|
||||
$gateways_status = return_gateways_status(true);
|
||||
$a_gateways = return_gateways_array();
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
if (isset($_POST['act']) && $_POST['act'] == "del" ) {
|
||||
@ -77,6 +79,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
}
|
||||
|
||||
legacy_html_escape_form_data($a_gateway_groups);
|
||||
legacy_html_escape_form_data($a_gateways);
|
||||
|
||||
$service_hook = 'apinger';
|
||||
|
||||
@ -133,54 +136,96 @@ $( document ).ready(function() {
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<td><?= gettext("Group Name") ?></td>
|
||||
<td class="hidden-xs"><?= gettext("Gateways") ?></td>
|
||||
<td class="hidden-xs"><?= gettext("Priority") ?></td>
|
||||
<td><?=gettext("Description");?></td>
|
||||
<td></td>
|
||||
<td><?= gettext('Name') ?></td>
|
||||
<td><?= gettext('Gateways') ?></td>
|
||||
<td class="hidden-xs"><?= gettext('Description') ?></td>
|
||||
<td class="text-nowrap"></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
$i = 0;
|
||||
foreach ($a_gateway_groups as $gateway_group) :
|
||||
foreach ($a_gateway_groups as $gateway_group):
|
||||
$priorities = array();
|
||||
foreach($gateway_group['item'] as $item) {
|
||||
$itemsplit = explode("|", $item);
|
||||
if (!isset($priorities[$itemsplit[1]])) {
|
||||
$priorities[$itemsplit[1]] = array();
|
||||
}
|
||||
if (!empty($a_gateways[$itemsplit[0]])) {
|
||||
$priorities[$itemsplit[1]][$itemsplit[0]] = $a_gateways[$itemsplit[0]];
|
||||
}
|
||||
}
|
||||
ksort($priorities);
|
||||
?>
|
||||
<tr>
|
||||
<td> <?=$gateway_group['name'];?> </td>
|
||||
<td class="hidden-xs">
|
||||
<td><?= $gateway_group['name'] ?></td>
|
||||
<td>
|
||||
<table class="table table-condensed">
|
||||
<?php
|
||||
foreach ($gateway_group['item'] as $item):?>
|
||||
<?=strtoupper(explode("|", $item)[0]);?> <br/>
|
||||
foreach ($priorities as $priority => $gateways):?>
|
||||
<tr>
|
||||
<td class="text-nowrap"><?=sprintf(gettext("Tier %s"), $priority);?></td>
|
||||
<td>
|
||||
<?php
|
||||
endforeach;?>
|
||||
foreach ($gateways as $gname => $gateway):
|
||||
$online = gettext('Pending');
|
||||
$gateway_label_class = 'default';
|
||||
if ($gateways_status[$gname]) {
|
||||
$status = $gateways_status[$gname]['status'];
|
||||
if (stristr($status, 'force_down')) {
|
||||
$online = gettext('Offline (forced)');
|
||||
$gateway_label_class = 'danger';
|
||||
} elseif (stristr($status, 'down')) {
|
||||
$online = gettext('Offline');
|
||||
$gateway_label_class = 'danger';
|
||||
} elseif (stristr($status, 'loss')) {
|
||||
$online = gettext('Warning (packetloss)');
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif (stristr($status, 'delay')) {
|
||||
$online = gettext('Warning (latency)');
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif ($status == 'none') {
|
||||
$online = gettext('Online');
|
||||
$gateway_label_class = 'success';
|
||||
} elseif (!empty($gateway['monitor_disable'])) {
|
||||
$online = gettext('Online');
|
||||
$gateway_label_class = 'success';
|
||||
}
|
||||
}
|
||||
?>
|
||||
<div class="label label-<?= $gateway_label_class ?>" style="margin-right:4px">
|
||||
<i class="fa fa-globe"></i>
|
||||
<?=$gateway['name'];?>, <?=$online;?>
|
||||
</div>
|
||||
<?php
|
||||
endforeach;?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
endforeach; ?>
|
||||
</table>
|
||||
</td>
|
||||
<td class="hidden-xs">
|
||||
<?php
|
||||
foreach ($gateway_group['item'] as $item):?>
|
||||
<?= sprintf(gettext('Tier %s'),explode("|", $item)[1]) ?> <br/>
|
||||
<?php
|
||||
endforeach;?>
|
||||
</td>
|
||||
<td><?=$gateway_group['descr'];?></td>
|
||||
<td>
|
||||
<td class="hidden-xs"><?=$gateway_group['descr'];?></td>
|
||||
<td class="text-nowrap">
|
||||
<a href="system_gateway_groups_edit.php?id=<?= $i ?>" class="btn btn-default btn-xs"
|
||||
title="edit group" data-toggle="tooltip">
|
||||
title="<?= html_safe(gettext('Edit')) ?>" data-toggle="tooltip">
|
||||
<span class="glyphicon glyphicon-pencil"></span>
|
||||
</a>
|
||||
<button type="button" class="btn btn-default btn-xs act-del-group"
|
||||
data-id="<?= $i ?>" title="<?= gettext("delete group") ?>" data-toggle="tooltip">
|
||||
data-id="<?= $i ?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
|
||||
<span class="fa fa-trash text-muted"></span>
|
||||
</button>
|
||||
<a href="system_gateway_groups_edit.php?dup=<?= $i ?>" class="btn btn-default btn-xs"
|
||||
title="clone group" data-toggle="tooltip">
|
||||
title="<?= html_safe(gettext('Clone')) ?>" data-toggle="tooltip">
|
||||
<span class="fa fa-clone text-muted"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php $i++;
|
||||
endforeach; ?>
|
||||
<tr class="hidden-xs">
|
||||
<td colspan="5">
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<?= gettext("Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, or policy-based routing. Without rules directing traffic into the Gateway Groups, they will not be used.") ?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -369,10 +369,10 @@ $( document ).ready(function() {
|
||||
$online = gettext('Offline');
|
||||
$gateway_label_class = 'danger';
|
||||
} elseif (stristr($status['status'], 'loss')) {
|
||||
$online = gettext('Warning, Packetloss').': '.$status['loss'];
|
||||
$online = gettext('Warning (packetloss)');
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif (stristr($status['status'], 'delay')) {
|
||||
$online = gettext('Warning, Latency').': '.$status['delay'];
|
||||
$online = gettext('Warning (latency)');
|
||||
$gateway_label_class = 'warning';
|
||||
} elseif ($status['status'] == 'none') {
|
||||
$online = gettext('Online');
|
||||
@ -393,19 +393,19 @@ $( document ).ready(function() {
|
||||
</td>
|
||||
<td class="text-nowrap">
|
||||
<a href="system_gateways_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"
|
||||
data-toggle="tooltip" title="<?=gettext("Edit");?>">
|
||||
data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
|
||||
<span class="glyphicon glyphicon-pencil"></span>
|
||||
</a>
|
||||
<?php
|
||||
if (is_numeric($gateway['attribute'])) :?>
|
||||
<button data-id="<?=$i;?>" title="<?=gettext("Delete"); ?>" data-toggle="tooltip"
|
||||
<button data-id="<?=$i;?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip"
|
||||
class="act_delete btn btn-default btn-xs">
|
||||
<span class="fa fa-trash text-muted"></span>
|
||||
</button>
|
||||
<?php
|
||||
endif;?>
|
||||
<a href="system_gateways_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"
|
||||
data-toggle="tooltip" title="<?=gettext("Clone");?>">
|
||||
data-toggle="tooltip" title="<?= html_safe(gettext('Clone')) ?>">
|
||||
<span class="fa fa-clone text-muted"></span>
|
||||
</a>
|
||||
</td>
|
||||
@ -428,7 +428,7 @@ $( document ).ready(function() {
|
||||
if ($i > 0) :
|
||||
?>
|
||||
<button type="submit" id="btn_delete" name="del_x" class="btn btn-default btn-xs" data-toggle="tooltip"
|
||||
title="<?=gettext("Delete selected items");?>">
|
||||
title="<?= html_safe(gettext('Delete selected items')) ?>">
|
||||
<span class="fa fa-trash text-muted"></span>
|
||||
</button>
|
||||
<?php
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user