Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php	(revision 10258)
+++ includes/definitions/os.inc.php	(working copy)
@@ -1136,6 +1136,63 @@
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2928.1.";
 $config['os'][$os]['graphs'][]              = "device_bits";
 
+
+// westermo
+
+$os = "westermo-lynx";
+$config['os'][$os]['text']                  = "Westermo Lynx";
+$config['os'][$os]['vendor']                = "westermo";
+$config['os'][$os]['type']                  = "network";
+//$config['os'][$os]['model']                 = "westermo";
+$config['os'][$os]['graphs'][]              = "device_bits";
+$config['os'][$os]['graphs'][]              = "device_ping";
+$config['os'][$os]['graphs'][]              = "device_uptime";
+$config['os'][$os]['graphs'][]              = "device_temperature";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.16177.1"; // L408F2
+$config['os'][$os]['mib_blacklist'][]       = "UCD-SNMP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CISCO-CDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "BGP4-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ADSL-LINE-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "DISMAN-PING-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "MIB-Dell-10892";
+$config['os'][$os]['mib_blacklist'][]       = "LSI-MegaRAID-SAS-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "SUPERMICRO-HEALTH-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CPQSINFO-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "OSPF-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "LLDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "IPV6-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "PW-STD-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "HOST-RESOURCES-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "EtherLike-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ENTITY-SENSOR-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ENTITY-MIB";
+$config['os'][$os]['mibs'][]                = "WESTERMO-LYNX-MIB";
+
+
+
+
+// On Time Network
+
+$os = "Ontime";
+$config['os'][$os]['text']                  = "On Time Network";
+$config['os'][$os]['vendor']                = "OnTimeNetwork";
+$config['os'][$os]['type']                  = "network";
+$config['os'][$os]['model']                 = "ontime";
+$config['os'][$os]['graphs'][]              = "device_bits";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.34753";
+/*
+$config['os'][$os]['mib_blacklist'][]       = "UCD-SNMP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CISCO-CDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "BGP4-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ADSL-LINE-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "DISMAN-PING-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "MIB-Dell-10892";
+$config['os'][$os]['mib_blacklist'][]       = "LSI-MegaRAID-SAS-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "SUPERMICRO-HEALTH-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CPQSINFO-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "OSPF-MIB";
+*/
+
 // Supermicro Switch
 
 $os = "supermicro-switch";
@@ -2861,18 +2918,7 @@
 $config['os'][$os]['graphs'][]              = "device_power";
 $config['os'][$os]['mibs'][]                = "JANITZA-MIB";
 
-// Lantech
 
-$os = "lantech-switch";
-$config['os'][$os]['text']                  = "Lantech Switch";
-$config['os'][$os]['vendor']                = "Lantech";
-$config['os'][$os]['type']                  = "network";
-$config['os'][$os]['model']                 = "lantech"; // Per-HW MIBs and hardware names
-$config['os'][$os]['remote_access']         = array('ssh', 'http', 'telnet');
-$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.37072.302.2"; // ipes-2208ca
-$config['os'][$os]['mib_blacklist']         = array("UCD-SNMP-MIB", "CISCO-CDP-MIB", "BGP4-MIB", "ADSL-LINE-MIB", "DISMAN-PING-MIB",
-                                                    "SUPERMICRO-HEALTH-MIB", "CPQSINFO-MIB", "HOST-RESOURCES-MIB", "OSPF-MIB");
-
 // NTI
 
 $os = "enviromux";
@@ -3521,9 +3567,22 @@
 $config['os'][$os]['type']                  = "power";
 $config['os'][$os]['graphs'][]              = "device_current";
 $config['os'][$os]['graphs'][]              = "device_voltage";
+$config['os'][$os]['graphs'][]              = "device_load";
+$config['os'][$os]['graphs'][]              = "device_ping";
 $config['os'][$os]['mibs'][]                = "UPS-MIB";
 $config['os'][$os]['mib_blacklist'][]       = "BGP4-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ADSL-LINE-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CISCO-CDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "DISMAN-PING-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ENTITY-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ENTITY-SENSOR-MIB";
 $config['os'][$os]['mib_blacklist'][]       = "HOST-RESOURCES-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "IF-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "IP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "IPV6-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "LLDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "Q-BRIDGE-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "UCD-SNMP-MIB";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.5491.1";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.5491.6";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.5491.306";
@@ -4102,6 +4161,38 @@
 $config['os'][$os]['mibs'][]                = "TRAPEZE-NETWORKS-AP-STATUS-MIB";
 $config['os'][$os]['mibs'][]                = "TRAPEZE-NETWORKS-AP-CONFIG-MIB";
 
+// Lancom devices - lcos is new, unified-MIB software. The others are legacy bullshit.
+
+/*
+$os = "lcos";
+$config['os'][$os]['text']                  = "LCOS";
+$config['os'][$os]['vendor']                = "Lancom";
+$config['os'][$os]['type']                  = "voip";
+$config['os'][$os]['ifname']                = TRUE;
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2356.11";
+$config['os'][$os]['mibs'][]                = "LCOS-MIB";
+
+*/
+$os = "lcos-1723";
+$config['os'][$os]['text']                  = "LCOS-1723";
+$config['os'][$os]['vendor']                = "Lancom";
+$config['os'][$os]['type']                  = "voip";
+$config['os'][$os]['ifname']                = TRUE;
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2356.500";
+$config['os'][$os]['mibs'][]                = "LANCOM-1723-MIB";
+
+/*
+$os = "lcos-old";
+$config['os'][$os]['text']                  = "LCOS (OLD)";
+$config['os'][$os]['vendor']                = "Lancom";
+$config['os'][$os]['type']                  = "voip";
+$config['os'][$os]['ifname']                = TRUE;
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.2356.600";
+$config['os'][$os]['model']                 = "lancom";
+//$config['os'][$os]['mibs'][]                = "LCOS-1723-MIB";
+*/
+
+
 $os = "netio-pdu";
 $config['os'][$os]['text']                  = "NetIO";
 $config['os'][$os]['type']                  = "power";
@@ -4561,6 +4652,7 @@
 
 $os = "smartware";
 $config['os'][$os]['text']                  = "Patton Smartnode";
+$config['os'][$os]['model']                 = "Patton Smartnode";
 $config['os'][$os]['vendor']                = "Patton";
 $config['os'][$os]['type']                  = "voip";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.1768.100.4.";
@@ -5453,6 +5545,77 @@
 $config['os'][$os]['mibs'][]                = "EIP-MON-MIB";
 //$config['os'][$os]['mibs'][]                = "EIP-MON-MIB";
 
+
+// PHOENIX CONTACT
+
+$os = "phoenixContact";
+$config['os'][$os]['text']                  = "Phoenix Contact";
+$config['os'][$os]['vendor']                = "Phoenix Contact";
+$config['os'][$os]['type']                  = "other"; //PLS
+$config['os'][$os]['graphs'][]              = "device_bits";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.4346.11";
+
+// Lantech
+
+$os = "Lantech";
+$config['os'][$os]['text']                  = "Lantech Switch";
+$config['os'][$os]['vendor']                = "Lantech";
+$config['os'][$os]['type']                  = "network";
+$config['os'][$os]['model']                 = "lantech";
+$config['os'][$os]['graphs'][]              = "device_bits";
+$config['os'][$os]['ifname']                = 1;
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.37072.302.2";
+//$config['os'][$os]['mib_blacklist'][]       = "UCD-SNMP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CISCO-CDP-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "BGP4-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "ADSL-LINE-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "DISMAN-PING-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "MIB-Dell-10892";
+$config['os'][$os]['mib_blacklist'][]       = "LSI-MegaRAID-SAS-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "SUPERMICRO-HEALTH-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "CPQSINFO-MIB";
+$config['os'][$os]['mib_blacklist'][]       = "OSPF-MIB";
+$config['os'][$os]['modules']['bgp-peers']       = 0;
+$config['os'][$os]['modules']['mac-accounting']  = 0;
+$config['os'][$os]['modules']['cisco-cbqos']     = 0;
+$config['os'][$os]['modules']['wifi'] = 0;
+$config['os'][$os]['modules']['p2p-radios'] = 0;
+$config['os'][$os]['modules']['wifi'] = 0;
+$config['os'][$os]['modules']['virtual-machines'] = 0;
+$config['os'][$os]['modules']['junose-atm-vp'] = 0;
+$config['os'][$os]['modules']['sla'] = 0;
+$config['os'][$os]['modules']['printersupplies'] = 0;
+
+ // Korenix
 // EOF