mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fixes to aruba accesspoint graphing
git-svn-id: http://www.observium.org/svn/observer/trunk@3225 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
if (is_numeric($vars['id']))
|
||||
{
|
||||
$ap = accesspoint_by_id($id);
|
||||
$ap = accesspoint_by_id($vars['id']);
|
||||
|
||||
if (is_numeric($ap['device_id']) && ($auth || device_permitted($ap['device_id'])))
|
||||
{
|
||||
|
@@ -1,6 +1,4 @@
|
||||
<?php
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
@@ -1,8 +1,5 @@
|
||||
<?php
|
||||
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
||||
|
@@ -1,8 +1,5 @@
|
||||
<?php
|
||||
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
||||
|
@@ -1,8 +1,5 @@
|
||||
<?php
|
||||
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
||||
|
@@ -1,10 +1,5 @@
|
||||
<?php
|
||||
|
||||
|
||||
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
||||
|
@@ -1,10 +1,5 @@
|
||||
<?php
|
||||
|
||||
|
||||
|
||||
$ap=accesspoint_by_id($id);
|
||||
$device = device_by_id_cache($ap['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
|
||||
safename("arubaap-$ap[name].$ap[radio_number].rrd");
|
||||
|
||||
|
24
html/includes/graphs/device/arubacontroller_numaps.inc.php
Normal file
24
html/includes/graphs/device/arubacontroller_numaps.inc.php
Normal file
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
$device = device_by_id_cache($_REQUEST['device']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/aruba-controller.rrd";
|
||||
|
||||
$rrd_list[0]['filename'] = $rrd_filename;
|
||||
$rrd_list[0]['descr'] = "Number of APs";
|
||||
$rrd_list[0]['ds'] = "NUMAPS";
|
||||
|
||||
$unit_text = "APs";
|
||||
$units='';
|
||||
$total_units='';
|
||||
$colours='mixed';
|
||||
|
||||
$scale_min = "0";
|
||||
$nototal = 1;
|
||||
|
||||
|
||||
if ($rrd_list)
|
||||
{
|
||||
include("includes/graphs/generic_multi_line.inc.php");
|
||||
}
|
||||
?>
|
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
|
||||
$device = device_by_id_cache($_REQUEST['device']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/aruba-controller.rrd";
|
||||
|
||||
$rrd_list[0]['filename'] = $rrd_filename;
|
||||
$rrd_list[0]['descr'] = "Clients";
|
||||
$rrd_list[0]['ds'] = "NUMCLIENTS";
|
||||
|
||||
$unit_text = "Clients";
|
||||
|
||||
$units='';
|
||||
$total_units='';
|
||||
$colours='mixed';
|
||||
|
||||
$scale_min = "0";
|
||||
|
||||
$nototal = 1;
|
||||
|
||||
if ($rrd_list)
|
||||
{
|
||||
include("includes/graphs/generic_multi_line.inc.php");
|
||||
}
|
||||
|
||||
|
||||
|
||||
?>
|
@@ -1,13 +1,13 @@
|
||||
<?php
|
||||
|
||||
global $config;
|
||||
|
||||
|
||||
$graph_array['height'] = "100";
|
||||
$graph_array['width'] = "215";
|
||||
$graph_array['to'] = $config['time']['now'];
|
||||
$graph_array['id'] = $ap['accesspoint_id'];
|
||||
$graph_array['type'] = $graph_type;
|
||||
|
||||
include("includes/print-quadgraphs.inc.php");
|
||||
include("includes/print-graphrow.inc.php");
|
||||
|
||||
?>
|
||||
|
20
html/pages/device/accesspoint.inc.php
Normal file
20
html/pages/device/accesspoint.inc.php
Normal file
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
|
||||
|
||||
$i = "1";
|
||||
|
||||
$ap = dbFetchRow("SELECT * FROM `accesspoint` WHERE `device_id` = ? AND `accesspoint_id` = ? AND `deleted` = '0' ORDER BY `name`,`radio_number` ASC", array($device['device_id'],$vars['ap']));
|
||||
|
||||
echo("<div class=ifcell style='margin: 0px;'><table width=100% cellpadding=10 cellspacing=0>");
|
||||
|
||||
include("includes/print-accesspoint.inc.php");
|
||||
|
||||
echo("</table></div>");
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
?>
|
20
html/pages/device/accesspoints.inc.php
Normal file
20
html/pages/device/accesspoints.inc.php
Normal file
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
|
||||
|
||||
$i = "1";
|
||||
|
||||
|
||||
$aps = dbFetchRows("SELECT * FROM `accesspoint` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `name`,`radio_number` ASC", array($device['device_id']));
|
||||
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
|
||||
foreach ($aps as $ap)
|
||||
{
|
||||
include("includes/print-accesspoint.inc.php");
|
||||
$i++;
|
||||
}
|
||||
echo("</table></div>");
|
||||
|
||||
|
||||
echo "</div>";
|
||||
|
||||
?>
|
Reference in New Issue
Block a user