Index: includes/definitions/os/avaya.inc.php
===================================================================
--- includes/definitions/os/avaya.inc.php	(revision 10974)
+++ includes/definitions/os/avaya.inc.php	(working copy)
@@ -56,9 +56,32 @@
 //$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.6889.1.8.1.49"; // S8700
 //$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.6889.1.8.1.56"; // S8400
 $config['os'][$os]['snmp']['nobulk']        = 1;
+
+$os = "avaya-smgr";
+$config['os'][$os]['text']                  = "Avaya System Manager";
+$config['os'][$os]['vendor']                = "Avaya";
+$config['os'][$os]['type']                  = "server";
+$config['os'][$os]['group']                 = "unix";
+$config['os'][$os]['sysObjectID'][]         = " .1.3.6.1.4.1.6889.1.35"; // System Manager
 $config['os'][$os]['mibs'][]                = "G3-AVAYA-MIB";
 
+$os = "avaya-sm";
+$config['os'][$os]['text']                  = "Avaya Session Manager";
+$config['os'][$os]['vendor']                = "Avaya";
+$config['os'][$os]['type']                  = "server";
+$config['os'][$os]['group']                 = "unix";
+$config['os'][$os]['sysObjectID'][]         = " .1.3.6.1.4.1.6889.1.36"; // Session Manager
+$config['os'][$os]['mibs'][]                = "G3-AVAYA-MIB";
 
+$os = "avaya-cm";
+$config['os'][$os]['text']                  = "Avaya Communication Manager";
+$config['os'][$os]['vendor']                = "Avaya";
+$config['os'][$os]['type']                  = "server";
+$config['os'][$os]['group']                 = "unix";
+$config['os'][$os]['sysObjectID'][]         = " .1.3.6.1.4.1.6889.1.73.2"; // Communication Manager VM
+$config['os'][$os]['mibs'][]                = "AVAYA-AURA-CM-MIB";
+$config['os'][$os]['mibs'][]                = "G3-AVAYA-MIB";
+
 $os = "avaya-eis"; /// Avaya product families are very confusing.
 $config['os'][$os]['text']                  = "Avaya EIS";
 $config['os'][$os]['vendor']                = "Avaya";
@@ -73,6 +96,14 @@
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.6889.1.9";    // Generic
 $config['os'][$os]['mibs'][]                = "G700-MG-MIB";
 
+$os = "avaya-g450"; /// Avaya product families are very confusing.
+$config['os'][$os]['text']                  = "Avaya G450";
+$config['os'][$os]['vendor']                = "Avaya";
+$config['os'][$os]['type']                  = "voice";
+$config['os'][$os]['ifname']                 = TRUE;
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.6889.1.45.103.8";
+$config['os'][$os]['mibs'][]                = "G700-MG-MIB";
+$config['os'][$os]['mibs'][]                = "UTILIZATION-MANAGEMENT-MIB";
 
 $os = "avaya-ipo";
 $config['os'][$os]['text']                  = "Avaya IP Office";
Index: includes/definitions/mibs/avaya.inc.php
===================================================================
--- includes/definitions/mibs/avaya.inc.php	(revision 10974)
+++ includes/definitions/mibs/avaya.inc.php	(working copy)
@@ -11,6 +11,16 @@
  */
 
 
+
+/**
+ *
+ * cmgHWType.0 = avayaG450
+ * cmgModelNumber.0 = "G450"
+ * cmgDescription.0 = "Avaya Inc., G450 Media Gateway, SW Version 36.13.0"
+ * cmgSerialNumber.0 = "15OL31648658"
+ *
+ */
+
 $mib = 'G700-MG-MIB';
 $config['mibs'][$mib]['enable'] = 1;
 $config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.6889.2.9';
@@ -17,8 +27,9 @@
 $config['mibs'][$mib]['mib_dir'] = 'avaya';
 $config['mibs'][$mib]['descr'] = 'Avaya G700 Media Gateway MIB';
 $config['mibs'][$mib]['serial'][] = array('oid' => 'cmgSerialNumber.0');
-// $config['mibs'][$mib]['hardware'][]     = array('oid' => 'cmgModelNumber.0'); // G700
-$config['mibs'][$mib]['hardware'][] = array('oid' => 'cmgDescription.0'); // Avaya G700 Media Gateway
+$config['mibs'][$mib]['hardware'][]     = array('oid' => 'cmgModelNumber.0'); // G700
+// $config['mibs'][$mib]['hardware'][] = array('oid' => 'cmgDescription.0'); // Avaya G700 Media Gateway
+$config['mibs'][$mib]['version'][] = array('oid' => 'cmgFWVersion.0');  // 36.13.0
 
 $config['mibs'][$mib]['sensor'][] = array('descr' => 'CPU Temperature', 'class' => 'temperature', 'measured' => 'device', 'oid' => 'cmgCpuTemp', 'oid_num' => '.1.3.6.1.4.1.6889.2.9.1.1.10.1', 'min' => 0);
 $config['mibs'][$mib]['sensor'][] = array('descr' => 'DSP Temperature', 'class' => 'temperature', 'measured' => 'device', 'oid' => 'cmgDspTemp', 'oid_num' => '.1.3.6.1.4.1.6889.2.9.1.1.10.4', 'min' => 0);
@@ -28,4 +39,30 @@
 $config['mibs'][$mib]['mib_dir'] = 'avaya';
 $config['mibs'][$mib]['descr'] = '';
 
+$mib = 'UTILIZATION-MANAGEMENT-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['mib_dir'] = 'avaya';
+$config['mibs'][$mib]['descr'] = '';
+$config['mibs'][$mib]['processor'][] = array(
+  'type'       => 'table',
+  'table'      => 'genCpuCurrentUtilization',
+  'descr'      => 'CPU Index %index% Utilization',
+  'oid'        => 'genCpuCurrentUtilization',
+  'oid_num'    => '.1.3.6.1.4.1.6889.2.1.11.1.1.1.1.6',
+  'measured'   => 'processor'
+);
+
+//$config['mibs'][$mib]['processor']['genCpuCurrentUtilization'] = array('type' => 'static', 'descr' => 'CPU', 'oid' => 'genCpuCurrentUtilization.10', 'oid_num' => '.1.3.6.1.4.1.6889.2.1.11.1.1.1.1.6.10'); // UTILIZATION-MANAGEMENT-MIB::genCpuCurrentUtilization.10 = 0
+$config['mibs'][$mib]['mempool']['Memory'] = array('type'     => 'static', 'descr' => 'Memory',
+                                                       'oid_total'    => 'genMemUtilizationTotalRAM.0', 'oid_total_num' => '1.3.6.1.4.1.6889.2.1.11.1.2.1.0', // UTILIZATION-MANAGEMENT-MIB::genMemUtilizationTotalRAM.0 = 196123888
+                                                       'oid_free'  => 'genMemUtilizationDynAllocMemAvailable.0', 'oid_free_num' => '1.3.6.1.4.1.6889.2.1.11.1.2.3.3.0', // UTILIZATION-MANAGEMENT-MIB::genMemUtilizationDynAllocMemAvailable.0 = 94021184
+);
+
+$mib = 'AVAYA-AURA-CM-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['mib_dir'] = 'avaya';
+$config['mibs'][$mib]['descr'] = 'Avaya Aura Communication Manager MIB.';
+$config['mibs'][$mib]['version'][] = array('oid' => 'avCmVersionRlsNumber.0');  // R017x.00.0.441.0
+
+
 // EOF