Index: html/pages/device/port/graphs.inc.php =================================================================== --- html/pages/device/port/graphs.inc.php (Revision 10042) +++ html/pages/device/port/graphs.inc.php (Arbeitskopie) @@ -91,7 +91,25 @@ echo(''); } + + if (is_file(get_port_rrdfilename($port, "baystackstats", TRUE))) + { + echo(''); + echo("

Drops On no Resources

"); + $graph_array['type'] = "port_baystackstats_dropnores"; + print_graph_row_port($graph_array, $port); + echo(''); + + echo(''); + echo("

Priority-Based Flow Control

"); + $graph_array['type'] = "port_baystackstats_pfcinout"; + + print_graph_row_port($graph_array, $port); + echo(''); + + } + if (is_file(get_port_rrdfilename($port, "fdbcount", TRUE))) { echo(''); Index: includes/definitions/mibs/avaya.inc.php =================================================================== --- includes/definitions/mibs/avaya.inc.php (Revision 10042) +++ includes/definitions/mibs/avaya.inc.php (Arbeitskopie) @@ -28,4 +28,11 @@ $config['mibs'][$mib]['mib_dir'] = 'avaya'; $config['mibs'][$mib]['descr'] = ''; +$mib = 'BAY-STACK-STATS-MIB'; +$config['mibs'][$mib]['enable'] = 1; +$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.45.5.12'; +$config['mibs'][$mib]['mib_dir'] = 'nortel'; +$config['mibs'][$mib]['descr'] = 'Avaya Networks Statistics MIB'; + + // EOF Index: includes/definitions/os.inc.php =================================================================== --- includes/definitions/os.inc.php (Revision 10042) +++ includes/definitions/os.inc.php (Arbeitskopie) @@ -1921,7 +1921,7 @@ $config['os_group'][$os_group]['vendor'] = "Avaya"; // Nortel Ethernet Routing Switch 5650TD Module - Port 36 // Avaya Ethernet Routing Switch 5650TD Module - Port 36 -$config['os_group'][$os_group]['port_label'][] = '/(?:Nortel|Avaya) .* Module - (.+)/i'; +$config['os_group'][$os_group]['port_label'][] = '/(?:Nortel|Avaya|Extreme) .* (?:Module|Platform (?:.*)) - (.+)/i'; $config['os_group'][$os_group]['graphs'][] = "device_bits"; $config['os_group'][$os_group]['mibs'][] = "S5-CHASSIS-MIB"; $config['os_group'][$os_group]['mibs'][] = "RAPID-CITY"; @@ -1931,12 +1931,24 @@ $config['os_group'][$os_group]['mib_blacklist'][] = "EtherLike-MIB"; // Self duplex polling $os = "avaya-ers"; -$config['os'][$os]['text'] = "ERS Software"; +$config['os'][$os]['text'] = "ERS Software (BOSS)"; $config['os'][$os]['type'] = "network"; $config['os'][$os]['group'] = "avaya"; $config['os'][$os]['ports_separate_walk'] = 1; // Force use separate ports polling feature $config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.45.3"; + +$os = 'avaya-vsp'; +$config['os'][$os]['text'] = 'VSP Operating System Software (VOSS)'; +$config['os'][$os]['type'] = 'network'; +$config['os'][$os]['group'] = 'avaya'; +$config['os'][$os]['ports_separate_walk'] = 1; // Force use separate ports polling feature $config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.2272"; +$config['os'][$os]['over'][0]['graph'] = 'device_bits'; +$config['os'][$os]['over'][0]['text'] = 'Device Traffic'; +$config['os'][$os]['over'][1]['graph'] = 'device_processor'; +$config['os'][$os]['over'][1]['text'] = 'CPU Usage'; +$config['os'][$os]['over'][2]['graph'] = 'device_mempool'; +$config['os'][$os]['over'][2]['text'] = 'Memory Usage'; $os = "avaya-bsr"; $config['os'][$os]['text'] = "BSR Software"; Index: includes/definitions/rrdtypes.inc.php =================================================================== --- includes/definitions/rrdtypes.inc.php (Revision 10042) +++ includes/definitions/rrdtypes.inc.php (Arbeitskopie) @@ -268,6 +268,14 @@ ), ); +$config['rrd_types']['port-baystackstats'] = array( + 'file' => 'port-%index%-baystackstats.rrd', + 'ds' => array( + 'IfNoResPktsDropped' => array('type' => 'DERIVE', 'min' => 0, 'max' => $config['max_port_speed']), + 'IfInPfcFrames' => array('type' => 'DERIVE', 'min' => 0, 'max' => $config['max_port_speed']), + 'IfOutPfcFrames' => array('type' => 'DERIVE', 'min' => 0, 'max' => $config['max_port_speed']), + ), +); $config['rrd_types']['port-dot3'] = array( 'file' => 'port-%index%-dot3.rrd',