Commit version 24.12.13800

This commit is contained in:
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions

View File

@ -4,9 +4,9 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage web
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @package observium
* @subpackage web
* @copyright (C) Adam Armstrong
*
*/
@ -21,51 +21,49 @@ echo '<tr><th class="state-marker"></th><th></th><th>Local Port</th><th>Peer Dev
echo '</thead>';
echo '<tbody>';
foreach (dbFetchRows("SELECT * FROM `eigrp_peers` WHERE `device_id` = ? AND `eigrp_vpn` = ? AND `eigrp_as` = ?", array($device['device_id'], $vars['vpn'], $vars['asn'])) AS $peer)
{
foreach (dbFetchRows("SELECT * FROM `eigrp_peers` WHERE `device_id` = ? AND `eigrp_vpn` = ? AND `eigrp_as` = ?", [$device['device_id'], $vars['vpn'], $vars['asn']]) as $peer) {
//print_vars($peer);
//print_vars($peer);
$peer['local_port'] = get_port_by_ifIndex($device['device_id'], $peer['peer_ifindex']);
$peer['local_port'] = get_port_by_ifIndex($device['device_id'], $peer['peer_ifindex']);
$ip = dbFetchRow("SELECT * FROM `ipv4_addresses` WHERE `ipv4_address` = ?", array($peer['peer_addr']));
if(is_array($ip))
{
$peer['port'] = get_port_by_id_cache($ip['port_id']);
$ip = dbFetchRow("SELECT * FROM `ipv4_addresses` WHERE `ipv4_address` = ?", [$peer['peer_addr']]);
if (is_array($ip)) {
$peer['port'] = get_port_by_id_cache($ip['port_id']);
$peer['device'] = device_by_id_cache($peer['port']['device_id']);
}
$peer['device'] = device_by_id_cache($peer['port']['device_id']);
}
echo '<tr class="'.$port['row_class'].'" onclick="openLink(\'' . generate_port_url($port) . '/\')" style="cursor: pointer;">';
echo '<tr class="' . $port['row_class'] . '" onclick="openLink(\'' . generate_port_url($port) . '/\')" style="cursor: pointer;">';
echo '
echo '
<td class="state-marker"></td>
<td style="width: 1px;"></td>
<td><span class="entity-title">'.(is_array($peer['local_port']) ? generate_port_link($peer['local_port']) : 'Unknown').'</span><br />'.$peer['local_port']['ifAlias'].'</td>
<td>'.$peer['peer_addr'].'<br /><span class="entity-title">'.(is_array($peer['device']) ? generate_device_link($peer['device']) : '').'</span></td>
<td><span class="entity-title">'.(is_array($peer['port']) ? generate_port_link($peer['port']) : '').'</span><br />
'.$peer['port']['ifAlias'].'</td>
<td>'.format_uptime($peer['peer_uptime']).'</td>
<td>'.$peer['peer_srtt'].'ms</td>
<td>'.$peer['peer_rto'].'ms</td>
<td>'.$peer['peer_version'].'</td>
<td><span class="entity-title">' . (is_array($peer['local_port']) ? generate_port_link($peer['local_port']) : 'Unknown') . '</span><br />' . $peer['local_port']['ifAlias'] . '</td>
<td>' . $peer['peer_addr'] . '<br /><span class="entity-title">' . (is_array($peer['device']) ? generate_device_link($peer['device']) : '') . '</span></td>
<td><span class="entity-title">' . (is_array($peer['port']) ? generate_port_link($peer['port']) : '') . '</span><br />
' . $peer['port']['ifAlias'] . '</td>
<td>' . format_uptime($peer['peer_uptime']) . '</td>
<td>' . $peer['peer_srtt'] . 'ms</td>
<td>' . $peer['peer_rto'] . 'ms</td>
<td>' . $peer['peer_version'] . '</td>
';
echo '</tr>';
echo '</tr>';
if (get_var_true($vars['graphs'])) {
echo '<tr>
if (get_var_true($vars['graphs'])) {
echo '<tr>
<td class="state-marker"></td>
<td colspan=8>';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $peer['eigrp_peer_id'];
$graph_array['type'] = 'eigrppeer_graph';
$graph_array['to'] = get_time();
$graph_array['id'] = $peer['eigrp_peer_id'];
$graph_array['type'] = 'eigrppeer_graph';
print_graph_row($graph_array);
print_graph_row($graph_array);
echo('</td></tr>');
}
echo('</td></tr>');
}
}

View File

@ -4,9 +4,9 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage web
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @package observium
* @subpackage web
* @copyright (C) Adam Armstrong
*
*/
@ -21,11 +21,10 @@ echo '<tr><th class="state-marker"></th><th></th><th>Port</th><th>AS</th><th>Pee
echo '</thead>';
echo '<tbody>';
foreach (dbFetchRows("SELECT * FROM `eigrp_ports` WHERE `device_id` = ? AND `eigrp_vpn` = ? AND `eigrp_as` = ?", array($device['device_id'], $vars['vpn'], $vars['asn'])) AS $eigrp_port)
{
foreach (dbFetchRows("SELECT * FROM `eigrp_ports` WHERE `device_id` = ? AND `eigrp_vpn` = ? AND `eigrp_as` = ?", [$device['device_id'], $vars['vpn'], $vars['asn']]) as $eigrp_port) {
$port = get_port_by_id($eigrp_port['port_id']);
echo '<tr class="' . $port['row_class'] . '" onclick="openLink(\'' . generate_port_url($port) . '/\')" style="cursor: pointer;">
$port = get_port_by_id($eigrp_port['port_id']);
echo '<tr class="' . $port['row_class'] . '" onclick="openLink(\'' . generate_port_url($port) . '/\')" style="cursor: pointer;">
<td class="state-marker"></td>
<td style="width: 1px;"></td>
@ -37,20 +36,20 @@ foreach (dbFetchRows("SELECT * FROM `eigrp_ports` WHERE `device_id` = ? AND `eig
<td>' . $eigrp_port['eigrp_authmode'] . '</td>
</tr>';
if (get_var_true($vars['graphs'])) {
echo '
if (get_var_true($vars['graphs'])) {
echo '
<tr>
<td class="state-marker"></td>
<td colspan=6>';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $eigrp_port['eigrp_port_id'];
$graph_array['type'] = 'eigrpport_packets';
$graph_array['to'] = get_time();
$graph_array['id'] = $eigrp_port['eigrp_port_id'];
$graph_array['type'] = 'eigrpport_packets';
print_graph_row($graph_array);
print_graph_row($graph_array);
echo '</td></tr>';
}
echo '</td></tr>';
}
}
echo '</tbody>';