Index: includes/definitions/os/extreme.inc.php
===================================================================
--- includes/definitions/os/extreme.inc.php	(Revision 10042)
+++ includes/definitions/os/extreme.inc.php	(Arbeitskopie)
@@ -133,4 +133,44 @@
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.4329.15.1.1";
 
 
+// AVAYA Switching and Routing / Extreme Networks since 2017
+
+$os_group = 'extremeavaya';
+$config['os_group'][$os_group]['vendor']          = "Extreme";
+$config['os_group'][$os_group]['icon']            = "extreme";
+//$config['os_group'][$os_group]['ifname']          = 1;
+$config['os_group'][$os_group]['port_label'][]    = '/(?:Nortel|Avaya|Extreme) .* (?:Module|Platform (?:.*)) - (.+)/i';
+$config['os_group'][$os_group]['ports_separate_walk'] = 1; // Force use separate ports polling feature
+$config['os_group'][$os_group]['graphs'][]        = "device_bits";
+$config['os_group'][$os_group]['graphs'][]        = "device_processor";
+$config['os_group'][$os_group]['graphs'][]        = "device_mempool";
+$config['os_group'][$os_group]['graphs'][]        = "device_fdb_count";
+$config['os_group'][$os_group]['mibs'][]          = "POWER-ETHERNET-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "S5-CHASSIS-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "RAPID-CITY";
+/*
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-SOFTWARE-MONITOR-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-BASE-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-SYSTEM-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-POE-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-VLAN-MIB";
+$config['os_group'][$os_group]['mibs'][]          = "EXTREME-FDB-MIB";
+*/
+$config['os_group'][$os_group]['mibs'][]          = "Q-BRIDGE-MIB";
+$config['os_group'][$os_group]['mib_blacklist'][] = "HOST-RESOURCES-MIB";
+$config['os_group'][$os_group]['mib_blacklist'][] = "CISCO-CDP-MIB"; // This mib not used on Extereme devices
+
+$os = "extreme-ers";
+$config['os'][$os]['text']                  = "ERS Software (BOSS)";
+$config['os'][$os]['type']                  = "network";
+$config['os'][$os]['group']                 = "extremeavaya";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.45.3";
+
+
+$os = 'extreme-vsp';
+$config['os'][$os]['text']                  = 'VSP Operating System Software (VOSS)';
+$config['os'][$os]['type']                  = 'network';
+$config['os'][$os]['group']                 = 'extremeavaya';
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2272";
+
 // EOF
Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php	(Revision 10042)
+++ includes/definitions/os.inc.php	(Arbeitskopie)
@@ -1919,9 +1919,7 @@
 
 $os_group = "avaya";
 $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";
@@ -1930,14 +1928,6 @@
 $config['os_group'][$os_group]['mib_blacklist'][] = "Q-BRIDGE-MIB";
 $config['os_group'][$os_group]['mib_blacklist'][] = "EtherLike-MIB"; // Self duplex polling
 
-$os = "avaya-ers";
-$config['os'][$os]['text']                  = "ERS Software";
-$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";
-$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2272";
-
 $os = "avaya-bsr";
 $config['os'][$os]['text']                  = "BSR Software";
 $config['os'][$os]['type']                  = "network";