fix junos ATM VC polling and display for tehvookje

git-svn-id: http://www.observium.org/svn/observer/trunk@1593 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-07-31 22:27:35 +00:00
parent dacdaf7267
commit 976986f325
5 changed files with 25 additions and 3 deletions

View File

@ -114,7 +114,7 @@ while ($device = mysql_fetch_array($device_query))
#include("includes/discovery/os.inc.php");
include("includes/discovery/ports.inc.php");
include("includes/discovery/entity-physical.inc.php");
# include("includes/discovery/entity-physical.inc.php");
include("includes/discovery/processors.inc.php");
include("includes/discovery/mempools.inc.php");
include("includes/discovery/ipv4-addresses.inc.php");

View File

@ -0,0 +1,22 @@
<?php
if($_GET['id']) { $atm_vp_id = $_GET['id']; }
$sql = "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
$query = mysql_query($sql);
$vp = mysql_fetch_array($query);
$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
if(is_file($rrd_test)) {
$rrd_filename = $rrd_test;
}
$rra_in = "inpacketoctets";
$rra_out = "outpacketoctets";
include("includes/graphs/generic_bits.inc.php");
?>

View File

@ -15,7 +15,7 @@
echo('</tr>');
$graph_array['height'] = "100";
$graph_array['width'] = "215";
$graph_array['width'] = "214";
$graph_array['to'] = $now;
$graph_array['id'] = $vp['juniAtmVp_id'];
$graph_array['type'] = $graph_type;

View File

@ -1,7 +1,6 @@
<?php
$sql = "SELECT * FROM `ports` AS P, `juniAtmVp` AS J WHERE P.`device_id` = '".$device['device_id']."' AND J.interface_id = P.interface_id";
echo("$sql");
$vp_data = mysql_query($sql);
if(mysql_affected_rows()) {

View File

@ -195,6 +195,7 @@ while ($device = mysql_fetch_array($device_query))
include("includes/polling/ports.inc.php");
include("includes/polling/cisco-mac-accounting.inc.php");
include("includes/polling/bgpPeer.inc.php");
include("includes/polling/junose-atm-vp.inc.php");
include("includes/polling/toner.inc.php");
include("includes/polling/ucd-diskio.inc.php");
include("includes/polling/applications.inc.php");