Index: includes/definitions/os.inc.php =================================================================== --- includes/definitions/os.inc.php (revision 6087) +++ includes/definitions/os.inc.php (working copy) @@ -551,7 +551,11 @@ $config['os'][$os]['over'][1]['graph'] = "device_processor"; $config['os'][$os]['over'][2]['graph'] = "device_mempool"; $config['os'][$os]['icon'] = "cisco"; +$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.9.1.828"; // 2100 Series +$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.14179.1.1.4.3"; // 4400 Series +$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.9.1.1069"; // 5500 Series $config['os'][$os]['mibs'][] = "AIRESPACE-WIRELESS-MIB"; +$config['os'][$os]['mibs'][] = "AIRESPACE-SWITCHING-MIB"; $os = "cisco-ons"; $config['os'][$os]['text'] = "Cisco Cerent ONS"; Index: includes/discovery/mempools/airespace-switching-mib.inc.php =================================================================== --- includes/discovery/mempools/airespace-switching-mib.inc.php (revision 0) +++ includes/discovery/mempools/airespace-switching-mib.inc.php (working copy) @@ -0,0 +1,33 @@ +<?php + +/** + * Observium + * + * This file is part of Observium. + * + * @package observium + * @subpackage discovery + * @copyright (C) 2006-2014 Adam Armstrong + * + */ + +$mib = 'AIRESPACE-SWITCHING-MIB'; +echo(" $mib "); + +// AIRESPACE-SWITCHING-MIB::agentFreeMemory.0 = 466732 +// AIRESPACE-SWITCHING-MIB::agentTotalMemory.0 = 1000952 + +$free = snmp_get($device, 'agentFreeMemory.0', '-OQUvs', $mib, mib_dirs('cisco')); +$total = snmp_get($device, 'agentTotalMemory.0', '-OQUvs', $mib, mib_dirs('cisco')); +$free *= 1024; +$total *= 1024; +$used = $total - $free; + +if (is_numeric($used) && is_numeric($total)) +{ + discover_mempool($valid['mempool'], $device, 0, $mib, 'Memory', 1024, $total, $used); +} + +unset ($total, $used, $free); + +// EOF Index: includes/discovery/os/wlc.inc.php =================================================================== --- includes/discovery/os/wlc.inc.php (revision 6087) +++ includes/discovery/os/wlc.inc.php (working copy) @@ -1,19 +0,0 @@ -<?php - -/** - * Observium - * - * This file is part of Observium. - * - * @package observium - * @subpackage discovery - * @copyright (C) 2006-2014 Adam Armstrong - * - */ - -if (!$os) -{ - if (strstr($sysDescr, "Cisco Controller")) { $os = "wlc"; } -} - -// EOF Index: includes/polling/mempools/airespace-switching-mib.inc.php =================================================================== --- includes/polling/mempools/airespace-switching-mib.inc.php (revision 0) +++ includes/polling/mempools/airespace-switching-mib.inc.php (working copy) @@ -0,0 +1,20 @@ +<?php + +/** + * Observium + * + * This file is part of Observium. + * + * @package observium + * @subpackage poller + * @copyright (C) 2006-2014 Adam Armstrong + * + */ + +$mib = 'AIRESPACE-SWITCHING-MIB'; + +$mempool['free'] = snmp_get($device, 'agentFreeMemory.0', '-OQUvs', $mib, mib_dirs('cisco')); +$mempool['total'] = snmp_get($device, 'agentTotalMemory.0', '-OQUvs', $mib, mib_dirs('cisco')); +$mempool['used'] = $mempool['total'] - $mempool['free']; + +// EOF Index: includes/polling/os/wlc.inc.php =================================================================== --- includes/polling/os/wlc.inc.php (revision 6087) +++ includes/polling/os/wlc.inc.php (working copy) @@ -13,7 +13,8 @@ $hardware = $entPhysical['entPhysicalModelName']; $version = $entPhysical['entPhysicalSoftwareRev']; +$serial = $entPhysical['entPhysicalSerialNum']; -if (empty($hardware)) { $hardware = snmp_get($device, "sysObjectID.0", "-Osqv", "SNMPv2-MIB:CISCO-PRODUCTS-MIB"); } +if (empty($hardware)) { $hardware = snmp_get($device, 'sysObjectID.0', '-Osqv', 'SNMPv2-MIB:CISCO-PRODUCTS-MIB', mib_dirs('cisco')); } // EOF