mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add code to remove old entries from ports_stack

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2469 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-15 16:52:28 +00:00
parent a4f78e84f0
commit 51224f7608
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/bits.inc.php
+4 -4
View File
@@ -4,14 +4,14 @@
$device = device_by_id_cache($id); $device = device_by_id_cache($id);
foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($id)) as $int) foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($id)) as $port)
{ {
$ignore = 0; $ignore = 0;
if (is_array($config['device_traffic_iftype'])) if (is_array($config['device_traffic_iftype']))
{ {
foreach ($config['device_traffic_iftype'] as $iftype) foreach ($config['device_traffic_iftype'] as $iftype)
{ {
if (preg_match($iftype ."i", $int['ifType'])) if (preg_match($iftype ."i", $port['ifType']))
{ {
$ignore = 1; $ignore = 1;
} }
@@ -21,14 +21,14 @@ foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($id))
{ {
foreach ($config['device_traffic_descr'] as $ifdescr) foreach ($config['device_traffic_descr'] as $ifdescr)
{ {
if (preg_match($ifdescr."i", $int['ifDescr']) || preg_match($ifdescr."i", $int['ifName']) || preg_match($ifdescr."i", $int['portName'])) if (preg_match($ifdescr."i", $port['ifDescr']) || preg_match($ifdescr."i", $port['ifName']) || preg_match($ifdescr."i", $port['portName']))
{ {
$ignore = 1; $ignore = 1;
} }
} }
} }
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"); $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
if (is_file($rrd_filename) && $ignore != 1) if (is_file($rrd_filename) && $ignore != 1)
{ {
$rrd_filenames[] = $rrd_filename; $rrd_filenames[] = $rrd_filename;
html/pages/device/ports.inc.php
+5
View File
@@ -1,5 +1,10 @@
<?php <?php
echo("<pre>");
print_r($_GET);
print_r($vars);
echo("</pre>");
if ($_GET['optc'] == 'graphs') if ($_GET['optc'] == 'graphs')
{ {
if ($_GET['optd']) { $graph_type = "port_" . $_GET['optd']; } else { $graph_type = "port_bits"; } if ($_GET['optd']) { $graph_type = "port_" . $_GET['optd']; } else { $graph_type = "port_bits"; }
includes/discovery/ports-stack.inc.php
+10
View File
@@ -35,6 +35,16 @@ foreach($stack_poll_array as $interface_id_high => $entry_high)
} }
} }
foreach ($stack_db_array AS $interface_id_high => $array)
{
foreach ($array AS $interface_id_low => $blah)
{
echo($device['device_id']." ".$interface_id_low." ".$interface_id_high. "\n");
dbDelete('ports_stack', "`device_id` = ? AND interface_id_high = ? AND interface_id_low = ?", array($device['device_id'], $interface_id_high, $interface_id_low));
echo("-");
}
}
echo("\n"); echo("\n");
?> ?>