From 2283d6f17d5959a2dff1126a159a1115ea0f7517 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 31 Jul 2010 01:03:32 +0000 Subject: [PATCH] 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 --- html/images/icons/greyscale/wireless.png | Bin 0 -> 701 bytes html/images/icons/wireless.png | Bin 0 -> 749 bytes ...ients.inc.php => aironet_wifi_clients.inc.php} | 0 ...eless.inc.php => aironet_wifi_clients.inc.php} | 10 +++++----- includes/static-config.php | 6 +++++- poller.php | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100755 html/images/icons/greyscale/wireless.png create mode 100755 html/images/icons/wireless.png rename html/includes/graphs/device/{wificlients.inc.php => aironet_wifi_clients.inc.php} (100%) rename includes/polling/{wireless.inc.php => aironet_wifi_clients.inc.php} (89%) diff --git a/html/images/icons/greyscale/wireless.png b/html/images/icons/greyscale/wireless.png new file mode 100755 index 0000000000000000000000000000000000000000..b95432c413c8a50bb524d68b6bb0d036afe3a2fb GIT binary patch literal 701 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{t+C3(BM zF#K=tKeHdm<1FxqEC$jZVC;4>+YTgHR^XTpq`_t}#2j0Dn1O+DtEY=&h{pNQiMAQR zfefwZ_v-IG* zu%#>@!`u3b-_iEj0j|uK7OBlLd--?&b;Zo1#oON3+*XvEd&F`|Y~wTDm^WdePcJR! zQQVg>vw0GuXs59sjbZQ`NjvQeSI!eW+YkgLNNc$ z@sw%JO>qLkRSx|o)B4!HdS)qinVs1+Bl+h2t7V1DBi6S?nm)f?eo#Sqla}!t_L4*I zCk2T3%TAsh@2?Ubbw}1vty|wW>*0b0GdO;pKODACq|hqoYL3QCb_XV{Y+j9ZYqWa4 zFIzX?=SkI>BUdkP>zDdeE4^Z3xcPyv-P*nhy2|@LI?E(=KR>0*utMYlcm0K<$Mby- z|NrEFcJa*mDR1gGPI)dpr{lX!wfNC_C+^>SQ*i6%#8n#xgg&oK&M=9DMly-pI8bt(R>0j7lS;_f#h}?%#X((Nw+%`@aKYQ?2OC7#SEE=o*;o8d`)H7+aZISeaOA8yH#{7;L(xvj;^(ZhlH;S|x4`hr6c$ x)iX$fYzWRzD=AMbN@Z|N$xljE@XSq2PYp^~6@vd$@?2>=$*APoQj literal 0 HcmV?d00001 diff --git a/html/images/icons/wireless.png b/html/images/icons/wireless.png new file mode 100755 index 0000000000000000000000000000000000000000..f54bf736cdc0d58a07c0a0171cc5a25b5e007e0e GIT binary patch literal 749 zcmVIO@l#-%@K+Q7zAyIUxr7=;KLsPe99&9Qy zmp_aWYb=E&ic)qE1ceaTL3I)s3+v0Pdzpnl)xpCDFYk3f*Ymue2{3J{X-|sELAYmu z=`Mqi(_pe~fr(oVM(R_x-rovW3XC#01TV%_L0BAvr#_hKf!+|yzTW7{?3 zIuq0Vz);x1M>XE7-^4 zB)oZq-|zSSd<|RjL3Q0FaG93$Sb#=w6_iQ0NQ>FM@oa+ksPjrN7+e#)=Jk5tx!vxB zO+TG2$)d_PZTpo~g1ZG9e0&b?=MikQx3}AOy1Ns6Sn&5>og;!Hg4gVJ`{#y+hUEVS z2o4GUBDiwY}B+wa2=)lh*=g2T3C=Dq fF3wcNZJhl8^(M*LyGLEt00000NkvXXu0mjfpmtoM literal 0 HcmV?d00001 diff --git a/html/includes/graphs/device/wificlients.inc.php b/html/includes/graphs/device/aironet_wifi_clients.inc.php similarity index 100% rename from html/includes/graphs/device/wificlients.inc.php rename to html/includes/graphs/device/aironet_wifi_clients.inc.php diff --git a/includes/polling/wireless.inc.php b/includes/polling/aironet_wifi_clients.inc.php similarity index 89% rename from includes/polling/wireless.inc.php rename to includes/polling/aironet_wifi_clients.inc.php index 07340cc776..f213d0070c 100644 --- a/includes/polling/wireless.inc.php +++ b/includes/polling/aironet_wifi_clients.inc.php @@ -4,12 +4,12 @@ echo "Wireless: "; 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"); @@ -43,7 +43,7 @@ if ($device['type'] == 'network') 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); - $graphs['airport_wireless'] = TRUE; + $graphs['aironet_wifi_clients'] = TRUE; } diff --git a/includes/static-config.php b/includes/static-config.php index 46ad728c7a..6431c8ec5f 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -457,7 +457,11 @@ $device_types = array('server', 'network', 'firewall', 'workstation', 'printer', ### 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']['order'] = '0'; diff --git a/poller.php b/poller.php index d588ec666f..ae35979d57 100755 --- a/poller.php +++ b/poller.php @@ -198,7 +198,7 @@ while ($device = mysql_fetch_array($device_query)) include("includes/polling/toner.inc.php"); include("includes/polling/ucd-diskio.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/cisco-ipsec-flow-monitor.inc.php");