more improvements to graphing system, fix aironet_wifi_clients graph

git-svn-id: http://www.observium.org/svn/observer/trunk@1565 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-31 01:03:32 +00:00
parent 9b95f61c4e
commit 2283d6f17d
6 changed files with 11 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

BIN
html/images/icons/wireless.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 749 B

View File

@@ -4,12 +4,12 @@ echo "Wireless: ";
if ($device['type'] == 'network') if ($device['type'] == 'network')
{ {
if ($device['os'] == 'airport') if ($device['os'] == 'aironet')
{ {
echo "Checking Airport Wireless clients... "; echo "Checking aironet Wireless clients... ";
$wificlients1 = snmp_get($device, "wirelessNumber.0", "-OUqnv", "AIRPORT-BASESTATION-3-MIB") +0; $wificlients1 = snmp_get($device, "wirelessNumber.0", "-OUqnv", "aironet-BASESTATION-3-MIB") +0;
echo($wificlients1 . " clients\n"); echo($wificlients1 . " clients\n");
@@ -43,7 +43,7 @@ if ($device['type'] == 'network')
rrdtool_update($wificlientsrrd,"N:".$wificlients1); rrdtool_update($wificlientsrrd,"N:".$wificlients1);
$graphs['airport_wireless'] = TRUE; $graphs['aironet_wifi_clients'] = TRUE;
} }
@@ -63,7 +63,7 @@ if ($device['type'] == 'network')
rrdtool_update($wificlientsrrd,"N:".$wificlients2); rrdtool_update($wificlientsrrd,"N:".$wificlients2);
$graphs['airport_wireless'] = TRUE; $graphs['aironet_wifi_clients'] = TRUE;
} }

View File

@@ -457,7 +457,11 @@ $device_types = array('server', 'network', 'firewall', 'workstation', 'printer',
### Graph Types ### Graph Types
$config['graph_sections'] = array('system', 'firewall', 'netstats', 'wifi', 'storage'); $config['graph_sections'] = array('system', 'firewall', 'netstats', 'wireless', 'storage');
$config['graph_types']['device']['aironet_wifi_clients']['section'] = 'wireless';
$config['graph_types']['device']['aironet_wifi_clients']['order'] = '0';
$config['graph_types']['device']['aironet_wifi_clients']['descr'] = 'Wireless Clients';
$config['graph_types']['device']['cipsec_flow_bits']['section'] = 'firewall'; $config['graph_types']['device']['cipsec_flow_bits']['section'] = 'firewall';
$config['graph_types']['device']['cipsec_flow_bits']['order'] = '0'; $config['graph_types']['device']['cipsec_flow_bits']['order'] = '0';

View File

@@ -198,7 +198,7 @@ while ($device = mysql_fetch_array($device_query))
include("includes/polling/toner.inc.php"); include("includes/polling/toner.inc.php");
include("includes/polling/ucd-diskio.inc.php"); include("includes/polling/ucd-diskio.inc.php");
include("includes/polling/applications.inc.php"); include("includes/polling/applications.inc.php");
include("includes/polling/wireless.inc.php"); include("includes/polling/aironet_wifi_clients.inc.php");
#include("includes/polling/altiga-ssl.inc.php"); #include("includes/polling/altiga-ssl.inc.php");
include("includes/polling/cisco-ipsec-flow-monitor.inc.php"); include("includes/polling/cisco-ipsec-flow-monitor.inc.php");