nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

move from port_id to interface_id. make ports discovery only discover. add some cleaner functions. add a tiny bit of alerting infrastructure.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3195 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-16 13:25:50 +00:00
parent 2e2379a8a1
commit 4db1454e92
100 changed files with 525 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/front/default.php
+1 -1
View File
@@ -42,7 +42,7 @@ if ($config['warn']['ifdown'])
$interface = ifNameDescr($interface);
generate_front_box("#ffdd99", "<center><strong>".generate_device_link($interface, shorthost($interface['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>Port Down</span><br />
<!-- <img src='graph.php?type=bits&amp;if=".$interface['interface_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=32' /> -->
<!-- <img src='graph.php?type=bits&amp;if=".$interface['port_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=32' /> -->
<strong>".generate_port_link($interface, truncate(makeshortif($interface['label']),13,''))."</strong> <br />
" . ($interface['ifAlias'] ? '<span class="body-date-1">'.truncate($interface['ifAlias'], 20, '').'</span>' : '') . "
</center>");
html/pages/front/demo.php
+1 -1
View File
@@ -96,7 +96,7 @@ if ($config['warn']['ifdown'])
$sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0'");
while ($interface = mysql_fetch_array($sql))
{
if (port_permitted($interface['interface_id']))
if (port_permitted($interface['port_id']))
{
echo("<div style='text-align: center; margin: 2px; border: solid 2px #D0D0D0; float: left; margin-right: 2px; padding: 3px; width: 118px; height: 85px; background: #ffddaa;'>
<strong>".generate_device_link($interface, shorthost($interface['hostname']))."</strong><br />
html/pages/front/example2.php
+3 -3
View File
@@ -116,7 +116,7 @@ if ($_SESSION['userlevel'] >= '5')
unset ($seperator);
while ($interface = mysql_fetch_assoc($query))
{
$ports['l2tp'] .= $seperator . $interface['interface_id'];
$ports['l2tp'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
@@ -126,7 +126,7 @@ if ($_SESSION['userlevel'] >= '5')
unset ($seperator);
while ($interface = mysql_fetch_assoc($query))
{
$ports['transit'] .= $seperator . $interface['interface_id'];
$ports['transit'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
@@ -136,7 +136,7 @@ if ($_SESSION['userlevel'] >= '5')
unset ($seperator);
while ($interface = mysql_fetch_assoc($query))
{
$ports['voip'] .= $seperator . $interface['interface_id'];
$ports['voip'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
html/pages/front/globe.php
+1 -1
View File
@@ -101,7 +101,7 @@ if ($config['warn']['ifdown'])
$interface = ifNameDescr($interface);
generate_front_box("#ffdd99", "<center><strong>".generate_device_link($interface, shorthost($interface['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>Port Down</span><br />
<!-- <img src='graph.php?type=bits&amp;if=".$interface['interface_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=32' /> -->
<!-- <img src='graph.php?type=bits&amp;if=".$interface['port_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=32' /> -->
<strong>".generate_port_link($interface, truncate(makeshortif($interface['label']),13,''))."</strong> <br />
" . ($interface['ifAlias'] ? '<span class="body-date-1">'.truncate($interface['ifAlias'], 20, '').'</span>' : '') . "
</center>");
html/pages/front/jt.php
+3 -3
View File
@@ -42,7 +42,7 @@ if ($config['warn']['ifdown']) {
$sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0'");
while ($interface = mysql_fetch_assoc($sql)) {
if (port_permitted($interface['interface_id'])) {
if (port_permitted($interface['port_id'])) {
echo("<div style='text-align: center; margin: 2px; border: solid 2px #D0D0D0; float: left; margin-right: 2px; padding: 3px; width: 118px; height: 85px; background: #ffddaa;'>
<strong>".generate_device_link($interface, shorthost($interface['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>Port Down</span><br />
@@ -120,7 +120,7 @@ if ($_SESSION['userlevel'] >= '5')
$query = mysql_query($sql);
unset ($seperator);
while ($interface = mysql_fetch_assoc($query)) {
$ports['transit'] .= $seperator . $interface['interface_id'];
$ports['transit'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
@@ -128,7 +128,7 @@ if ($_SESSION['userlevel'] >= '5')
$query = mysql_query($sql);
unset ($seperator);
while ($interface = mysql_fetch_assoc($query)) {
$ports['peering'] .= $seperator . $interface['interface_id'];
$ports['peering'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
html/pages/front/traffic.php
+4 -4
View File
@@ -42,7 +42,7 @@ if ($config['warn']['ifdown']) {
foreach (dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0'") as $interface)
{
if (port_permitted($interface['interface_id'])) {
if (port_permitted($interface['port_id'])) {
echo("<div style='text-align: center; margin: 2px; border: solid 2px #D0D0D0; float: left; margin-right: 2px; padding: 3px; width: 118px; height: 85px; background: #ffddaa;'>
<strong>".generate_device_link($interface, shorthost($interface['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>Port Down</span><br />
@@ -119,7 +119,7 @@ if ($_SESSION['userlevel'] >= '5')
$query = mysql_query($sql);
unset ($seperator);
while ($interface = mysql_fetch_assoc($query)) {
$ports['transit'] .= $seperator . $interface['interface_id'];
$ports['transit'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
@@ -127,7 +127,7 @@ if ($_SESSION['userlevel'] >= '5')
$query = mysql_query($sql);
unset ($seperator);
while ($interface = mysql_fetch_assoc($query)) {
$ports['peering'] .= $seperator . $interface['interface_id'];
$ports['peering'] .= $seperator . $interface['port_id'];
$seperator = ",";
}
@@ -135,7 +135,7 @@ if ($_SESSION['userlevel'] >= '5')
$query = mysql_query($sql);
unset ($seperator);
while ($interface = mysql_fetch_assoc($query)) {
$ports['core'] .= $seperator . $interface['interface_id'];
$ports['core'] .= $seperator . $interface['port_id'];
$seperator = ",";
}