157,165d156
< $os_group = "axis";
< $config['os_group'][$os_group]['icon']              = "axis";
< // ; AXIS 241S; Video Server; 4.47; May 30 2008 15:19; 11C.1; 1;
< // ; AXIS M1011-W; Network Camera; 5.20.2; Sep 09 2011 10:44; 171; 1;
< // ; AXIS P7214; Network Video Encoder; 5.50.4; May 23 2014 12:23; 197.2; 1;
< $config['os_group'][$os_group]['sysDescr_regex'][]  = '/AXIS (?<hardware>[\w\-\+]+);.+?; (?<version>[\d\.]+)/';
< // AXIS 5600+ Network Print Server V7.10.2 Jan 30 2007
< $config['os_group'][$os_group]['sysDescr_regex'][]  = '/AXIS (?<hardware>[\w\-\+]+) [\w ]+?V(?<version>[\d\.]+)/';
< 
1719d1709
< $config['os_group'][$os_group]['ifname']            = 1;
1775c1765
< // BTI Systems / Juniper Networks has acquired BTI Systems
---
> // BTI Systems
1781c1771
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.18070.2";
---
> $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.18070.2.2";
1796c1786
< $config['os'][$os]['mibs'][]                = "WWP-LEOS-SYSTEM-CONFIG-MIB";
---
> $config['os'][$os]['mibs'][]                = "CIENA-TOPSECRET-MIB"; // Not really, but meh. -TL
2157c2147
< $config['os'][$os]['vendor']                = "A10";
---
> $config['os'][$os]['icon']                  = "a10";
2160,2163d2149
< // AX Series Advanced Traffic Manager AXvThunder, ACOS 2.8.1-P2,
< // AX Series Advanced Traffic Manager AXvThunder, ACOS 4.0.1,
< // Thunder Series Unified Application Service Gateway TH3030S, ACOS 2.7.2-P7,
< $config['os'][$os]['sysDescr_regex'][]      = '/(?:AX)?(?<hardware>\w+), ACOS (?<version>\d[\w\.\-]+)/';
2166,2175d2151
< $os = "a10-ex";
< $config['os'][$os]['text']                  = "A10 EX";
< $config['os'][$os]['type']                  = "loadbalancer";
< $config['os'][$os]['vendor']                = "A10";
< $config['os'][$os]['graphs'][]              = "device_bits";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.22610.1.2";
< // A10 Networking System Software Copyright (c) 2004-2009 by A10 Networks, Inc. http://www.a10networks.com/support Hardware Version: 1.0 Software Version: 3.2
< $config['os'][$os]['sysDescr_regex'][]      = '/Software Version: (?<version>\d[\w\.\-]+)/';
< //$config['os'][$os]['mibs'][]                = "A10-EX-MIB";
< 
2537d2512
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.674.10895.3062";  // VRTX R1-2210
2644,2672d2618
< // Dell/EMC
< 
< $os = "onefs";
< $config['os'][$os]['text']                  = "Isilon OneFS";
< $config['os'][$os]['type']                  = "storage";
< $config['os'][$os]['icon']                  = "isilon";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.12124.1";
< $config['os'][$os]['sysDescr'][]            = "/Isilon OneFS/";
< $config['os'][$os]['mibs'][]                = "HOST-RESOURCES-MIB";   // There duplicate entry as in default, for correct order!
< $config['os'][$os]['mibs'][]                = "ISILON-MIB";
< 
< $os = "emc-flare";
< $config['os'][$os]['text']                  = "EMC Flare OS";
< $config['os'][$os]['type']                  = "storage";
< $config['os'][$os]['icon']                  = "emc";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.1981.1";
< $config['os'][$os]['sysDescr'][]            = "/^[\w\-]+ - Flare \d[\d\.\-]+/";
< // CX300 - Flare 2.07.0.300.5.008
< // AX4-5i - Flare 2.23.0.50.5.711
< $config['os'][$os]['sysDescr_regex'][]      = '/^(?<hardware>[\w\-]+) - Flare (?<version>\d[\d\.\-]+)/';
< 
< $os = "emc-snas";
< $config['os'][$os]['text']                  = "EMC SNAS";
< $config['os'][$os]['type']                  = "storage";
< $config['os'][$os]['icon']                  = "emc";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.1139";
< // Product: EMC Celerra File Server Project: SNAS Version: T6.0.70.4
< $config['os'][$os]['sysDescr_regex'][]      = '/SNAS Version: [A-Z]*(?<version>\d[\d\.\-]+)/i';
< 
2991a2938
> $config['os'][$os]['icon']                  = "axis";
3000a2948
> $config['os'][$os]['icon']                  = "axis";
3006a2955
> $config['os'][$os]['icon']                  = "axis";
3012a2962
> $config['os'][$os]['icon']                  = "axis";
3407c3357
< $config['os'][$os]['text']                  = "IBM (Lenovo) Flex Switch";
---
> $config['os'][$os]['text']                  = "IBM Flex Switch";
3410,3413c3360,3361
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.20301.1.18";
< // IBM Flex System Fabric EN4093 10Gb Scalable Switch(Upgrade1)
< // Lenovo Flex System Fabric EN4093R 10Gb Scalable Switch
< $config['os'][$os]['sysDescr'][]            = "/^(IBM|Lenovo) Flex .+?Switch/";
---
> $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.20301.1.18.13"; // EN4093
> $config['os'][$os]['sysDescr'][]            = "/^IBM Flex .+?Switch/"; // IBM Flex System Fabric EN4093 10Gb Scalable Switch(Upgrade1)
3428a3377,3387
> // EMC Isilon OneFS
> 
> $os = "onefs";
> $config['os'][$os]['text']                  = "Isilon OneFS";
> $config['os'][$os]['type']                  = "storage";
> $config['os'][$os]['icon']                  = "isilon";
> $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.12124.1";
> $config['os'][$os]['sysDescr'][]            = "/Isilon OneFS/";
> $config['os'][$os]['mibs'][]                = "HOST-RESOURCES-MIB";   // There duplicate entry as in default, for correct order!
> $config['os'][$os]['mibs'][]                = "ISILON-MIB";
> 
4825c4784
< // Acme Packet / Oracle since 2013
---
> // Acme Packet
4830c4789
< $config['os'][$os]['icon']                  = "acmepacket";
---
> $config['os'][$os]['icon']                  = "acme";
5363,5494d5321
< 
< // ICT Power
< 
< $os = "ict-pdu";
< $config['os'][$os]['vendor']                = "ICT Power";
< $config['os'][$os]['text']                  = "ICT Distribution Panel";
< $config['os'][$os]['icon']                  = "ict";
< $config['os'][$os]['group']                 = "pdu";
< $config['os'][$os]['graphs'][]              = "device_voltage";
< $config['os'][$os]['graphs'][]              = "device_current";
< $config['os'][$os]['snmp']['nobulk']        = 1;
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.39145.10";
< $config['os'][$os]['mibs'][]                = "ICT-MIB";
< 
< // Mitsubishi
< 
< $os = "mitsubishi-ups";
< $config['os'][$os]['vendor']                = "Mitsubishi";
< $config['os'][$os]['text']                  = "Mitsubishi UPS";
< $config['os'][$os]['group']                 = "ups";
< $config['os'][$os]['graphs'][]              = "device_voltage";
< $config['os'][$os]['graphs'][]              = "device_current";
< $config['os'][$os]['graphs'][]              = "device_frequency";
< $config['os'][$os]['graphs'][]              = "device_power";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.13891.101";
< $config['os'][$os]['mibs'][]                = "MITSUBISHI-UPS-MIB";
< 
< // TrendMicro
< 
< $os = "tippingpoint-ips";
< $config['os'][$os]['text']                  = "TippingPoint IPS"; // Intrusion Prevention System
< $config['os'][$os]['vendor']                = "TrendMicro";
< $config['os'][$os]['type']                  = "security";
< $config['os'][$os]['graphs'][]              = "device_bits";
< $config['os'][$os]['graphs'][]              = "device_processor";
< $config['os'][$os]['graphs'][]              = "device_mempool";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.10734.1.3";
< $config['os'][$os]['sysDescr'][]            = "/^TippingPoint IPS/";
< $config['os'][$os]['mibs'][]                = "TPT-HEALTH-MIB";
< $config['os'][$os]['mibs'][]                = "TPT-RESOURCE-MIB";
< $config['os'][$os]['mibs'][]                = "TPT-TPA-HARDWARE-MIB";
< 
< $os = "tippingpoint-sms";
< $config['os'][$os]['text']                  = "TippingPoint SMS"; // Security Management System
< $config['os'][$os]['vendor']                = "TrendMicro";
< $config['os'][$os]['type']                  = "security";
< $config['os'][$os]['graphs'][]              = "device_bits";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.10734.1.4";
< // SMS vsidsmon vSMS 4.5.0.98012
< $config['os'][$os]['sysDescr_regex'][]      = '/(?<hardware>\w+) (?<version>\d[\d\.\-]+)/';
< 
< // iRZ
< 
< $os = "irz-os";
< $config['os'][$os]['text']                  = "iRZ Linux";
< $config['os'][$os]['vendor']                = "iRZ";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.35489";
< $config['os'][$os]['type']                  = "network";
< $config['os'][$os]['ports_skip_ifType']     = TRUE;
< 
< // Siklu EH
< $os = "siklu-wl";
< $config['os'][$os]['text']                  = "Siklu EtherHaul";
< $config['os'][$os]['vendor']                = "Siklu";
< $config['os'][$os]['type']                  = "radio";
< $config['os'][$os]['sysDescr_regex'][]      = '/^(?<hardware>.*)/';
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.31926";
< 
< // SUMMIT DEVELOPLMENT
< 
< $os = "summitd-wl";
< $config['os'][$os]['text']                  = "Summit Developlment";
< $config['os'][$os]['icon']                  = "summitd";
< $config['os'][$os]['type']                  = "radio";
< $config['os'][$os]['sysDescr_regex'][]      = '/^(?<hardware>\w+)/';
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.23688";
< 
< // Vubiq Networks
< 
< $os = "vubiq-wl";
< $config['os'][$os]['text']                  = "Vubiq HaulPass";
< $config['os'][$os]['icon']                  = "vubiq";
< $config['os'][$os]['type']                  = "radio";
< $config['os'][$os]['sysDescr_regex'][]      = '/^(?<hardware>\w+)/';
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.46330";
< 
< // Hirschmann
< 
< $os = "hirschmann-os";
< $config['os'][$os]['text']                  = "Hirschmann HiOS";
< $config['os'][$os]['vendor']                = "Hirschmann";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.248.11";
< $config['os'][$os]['type']                  = "network";
< $config['os'][$os]['mibs'][]                = "HM2-DEVMGMT-MIB";
< $config['os'][$os]['mibs'][]                = "HM2-PWRMGMT-MIB";
< $config['os'][$os]['mibs'][]                = "HM2-DIAGNOSTIC-MIB";
< 
< $os = "hirschmann-switch";
< $config['os'][$os]['text']                  = "Hirschmann Switch";
< $config['os'][$os]['vendor']                = "Hirschmann";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.248.14.10";
< $config['os'][$os]['type']                  = "network";
< $config['os'][$os]['mibs'][]                = "HMPRIV-MGMT-SNMP-MIB";
< 
< $os = "hirschmann-security";
< $config['os'][$os]['text']                  = "Hirschmann Security OS";
< $config['os'][$os]['vendor']                = "Hirschmann";
< $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.248.14.10.23";
< $config['os'][$os]['type']                  = "firewall";
< 
< // Digipower
< 
< $os = "digipower-ups";
< $config['os'][$os]['text']                  = "Digipower UPS";
< $config['os'][$os]['group']                 = "ups";
< $config['os'][$os]['vendor']                = "Digipower";
< $config['os'][$os]['graphs'][]              = "device_current";
< $config['os'][$os]['graphs'][]              = "device_voltage";
< //$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.17420";
< $config['os'][$os]['discovery_os']          = "digipower";
< $config['os'][$os]['mibs'][]                = "DGPUPS-MIB";
< $config['os'][$os]['mibs'][]                = "DGPRPM-MIB";
< 
< $os = "digipower-pdu";
< $config['os'][$os]['text']                  = "Digipower PDU";
< $config['os'][$os]['group']                 = "pdu";
< $config['os'][$os]['vendor']                = "Digipower";
< $config['os'][$os]['graphs'][]              = "device_current";
< //$config['os'][$os]['graphs'][]              = "device_voltage";
< //$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.17420";
< $config['os'][$os]['discovery_os']          = "digipower";
< $config['os'][$os]['mibs'][]                = "DGPPDU-MIB";