From 3fbd4c2cb53c4c146ea4224503a01ff16365d0f4 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 15 May 2012 16:59:01 +0000
Subject: [PATCH] Add support for APC UPS. #55.

git-svn-id: http://www.observium.org/svn/observer/trunk@3188 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/definitions.inc.php                |  12 +
 includes/discovery/current/apc.inc.php      |   2 +-
 includes/discovery/frequencies/apc.inc.php  |   4 +-
 includes/discovery/humidity/apc.inc.php     |   2 +-
 includes/discovery/os/apc.inc.php           |   5 +-
 includes/discovery/temperatures/apc.inc.php |   2 +-
 includes/discovery/voltages/apc.inc.php     |   2 +-
 mibs/PowerNet-MIB                           | 246 +++++++++++++-------
 8 files changed, 189 insertions(+), 86 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 1122612d74..dd0d069bd5 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -663,6 +663,18 @@ $config['os'][$os]['text']              = "APC Management Module";
 $config['os'][$os]['type']              = "power";
 $config['os'][$os]['over'][0]['graph']  = "device_current";
 $config['os'][$os]['over'][0]['text']   = "Current";
+$config['os'][$os]['over'][1]['graph']  = "device_voltage";
+$config['os'][$os]['over'][1]['text']   = "Voltage";
+
+$os = "apcups";
+$config['os'][$os]['text']              = "APC UPS";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['group']             = "ups";
+$config['os'][$os]['icon']              = "apc";
+$config['os'][$os]['over'][0]['graph']  = "device_voltage";
+$config['os'][$os]['over'][0]['text']   = "Voltage";
+$config['os'][$os]['over'][1]['graph']  = "device_frequency";
+$config['os'][$os]['over'][1]['text']   = "Frequencies";
 
 $os = "netbotz";
 $config['os'][$os]['text']              = "Netbotz Environment sensor";
diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/current/apc.inc.php
index 1077b007ac..03cefd5b16 100644
--- a/includes/discovery/current/apc.inc.php
+++ b/includes/discovery/current/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-## APC
+## APC PDUs
 if ($device['os'] == "apc")
 {
   # PDU - Phase
diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/frequencies/apc.inc.php
index 05b550b28c..782473cfda 100644
--- a/includes/discovery/frequencies/apc.inc.php
+++ b/includes/discovery/frequencies/apc.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 ## APC
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
@@ -68,4 +68,4 @@ if ($device['os'] == "apc")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/humidity/apc.inc.php b/includes/discovery/humidity/apc.inc.php
index 35cade4f95..44bc25c3bf 100644
--- a/includes/discovery/humidity/apc.inc.php
+++ b/includes/discovery/humidity/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   # Environmental monitoring on UPSes etc
   # FIXME emConfigProbesTable may also be used? But not filled out on my device...
diff --git a/includes/discovery/os/apc.inc.php b/includes/discovery/os/apc.inc.php
index 0c2ab869e7..fd0b34ab85 100644
--- a/includes/discovery/os/apc.inc.php
+++ b/includes/discovery/os/apc.inc.php
@@ -2,10 +2,11 @@
 
 if (!$os)
 {
-  if (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
+  if (strstr(snmp_get($device, "SNMPv2-SMI::enterprises.318.1.1.1.1.1.1.0", "-Oqv", ""), "UPS")) { $os = "apcups"; }
+  elseif (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
   elseif (strstr($sysDescr, "APC Metered Rack PDU")) { $os = "apc"; }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/apc.inc.php b/includes/discovery/temperatures/apc.inc.php
index bd7fa220c7..f5e182f1c7 100644
--- a/includes/discovery/temperatures/apc.inc.php
+++ b/includes/discovery/temperatures/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.2.2.2.0", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
diff --git a/includes/discovery/voltages/apc.inc.php b/includes/discovery/voltages/apc.inc.php
index 051ae4d966..7496827a07 100644
--- a/includes/discovery/voltages/apc.inc.php
+++ b/includes/discovery/voltages/apc.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 ## APC Voltages
-if ($device['os'] == "apc")
+if ($device['os'] == "apc" || $device['os'] == "apcups")
 {
   $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.3.1.3", "-OsqnU", "");
   if ($debug) { echo($oids."\n"); }
diff --git a/mibs/PowerNet-MIB b/mibs/PowerNet-MIB
index 46b7871b1c..2be26266f4 100644
--- a/mibs/PowerNet-MIB
+++ b/mibs/PowerNet-MIB
@@ -1,18 +1,18 @@
 -- *************************************************************************
 -- AMERICAN POWER CONVERSION PowerNet-MIB
 -- *************************************************************************
--- Copyright (c) 2011 American Power Conversion, Inc.
+-- Copyright (c) 2012 American Power Conversion, Inc.
 -- PowerNet is a Trademark of American Power Conversion Corp.
 --
 -- Title: APC TOP LEVEL PowerNet MIB
 --
--- Version : 4.0.3
+-- Version : 4.0.5
 --
 -- Generated by script: tomib.awk
 --
 -- Input File: powernetPS.mib
 --
--- Created: Thursday, January, 13, 2011
+-- Created: Wednesday, January, 11, 2012
 --
 -- Revision History:
 -- *************************************************************************
@@ -156,6 +156,13 @@
 --                   Added traps 758 to 763 to support UPS firmware update.
 --                   Deprecated all OIDs off branch mfiletransfer
 --                   Added rPDU2 Metered Outlet Data
+-- mm/dd/yy - v4.0.4 Updated several rPDU2 and rPDU OIDs.
+-- 12/07/11 - v4.0.5 Added new OID's for SYPX upsPhaseOutputPowerFactor and symmetraPxDisplay. 
+--					 Added SYS OID's for different Caphorn models galaxy5000UPS20KVA, galaxy5000UPS30KVA, galaxy5000UPS40KVA           
+--					 galaxy5000UPS50KVA, galaxy5000UPS60KVA , galaxy5000UPS80KVA, galaxy5000UPS100KVA, galaxy5000UPS120KVA
+--					 galaxy5000UPS130KVA, galaxy5500UPS20KVA, galaxy5500UPS30KVA, galaxy5500UPS40KVA, galaxy5500UPS50KVA
+--					 galaxy5500UPS60KVA, galaxy5500UPS80KVA, galaxy5500UPS100KVA, galaxy5500UPS120KVA, galaxy5500UPS130KVA    
+--					 and new OID upsAdvStateEcomode      	
 
 -- ********************************************************************************************
 -- ********************************************************************************************
@@ -423,6 +430,28 @@ galaxy300UPS15kVA31            OBJECT IDENTIFIER ::=  { galaxy 15 }
 galaxy300UPS20kVA31            OBJECT IDENTIFIER ::=  { galaxy 16 }
 galaxy300UPS30kVA31            OBJECT IDENTIFIER ::=  { galaxy 17 }
 
+galaxy5000UPS20KVA             OBJECT IDENTIFIER ::=  { galaxy 18 }
+galaxy5000UPS30KVA             OBJECT IDENTIFIER ::=  { galaxy 19 }
+galaxy5000UPS40KVA             OBJECT IDENTIFIER ::=  { galaxy 20 }
+galaxy5000UPS50KVA             OBJECT IDENTIFIER ::=  { galaxy 21 }
+galaxy5000UPS60KVA             OBJECT IDENTIFIER ::=  { galaxy 22 }
+galaxy5000UPS80KVA             OBJECT IDENTIFIER ::=  { galaxy 23 }
+galaxy5000UPS100KVA            OBJECT IDENTIFIER ::=  { galaxy 24 }
+galaxy5000UPS120KVA            OBJECT IDENTIFIER ::=  { galaxy 25 }
+galaxy5000UPS130KVA            OBJECT IDENTIFIER ::=  { galaxy 26 }
+galaxy5500UPS20KVA             OBJECT IDENTIFIER ::=  { galaxy 27 }
+galaxy5500UPS30KVA             OBJECT IDENTIFIER ::=  { galaxy 28 }
+galaxy5500UPS40KVA             OBJECT IDENTIFIER ::=  { galaxy 29 }
+galaxy5500UPS50KVA             OBJECT IDENTIFIER ::=  { galaxy 30 }
+galaxy5500UPS60KVA             OBJECT IDENTIFIER ::=  { galaxy 31 }
+galaxy5500UPS80KVA             OBJECT IDENTIFIER ::=  { galaxy 32 }
+galaxy5500UPS100KVA            OBJECT IDENTIFIER ::=  { galaxy 33 }
+galaxy5500UPS120KVA            OBJECT IDENTIFIER ::=  { galaxy 34 }
+galaxy5500UPS130KVA            OBJECT IDENTIFIER ::=  { galaxy 35 }
+
+
+
+
 conPortServAP930x              OBJECT IDENTIFIER ::=  { conPortServ 1 }
 
 gutorPEW                       OBJECT IDENTIFIER ::=  { gutor 1 }
@@ -921,6 +950,7 @@ symmetraPx160kVA                OBJECT IDENTIFIER ::=  { symmetraPX 2 }
 symmetraPx250kVA                OBJECT IDENTIFIER ::=  { symmetraPX 3 }
 symmetraPx500kVA                OBJECT IDENTIFIER ::=  { symmetraPX 4 }
 symmetraPx100kVA                OBJECT IDENTIFIER ::=  { symmetraPX 5 }
+symmetraPxDisplay               OBJECT IDENTIFIER ::=  { symmetraPX 6 }
 
 isx24ModuleHalfRackPdu          OBJECT IDENTIFIER ::=  { isxModDistribution  1 }
 isx6ModuleRackPdu               OBJECT IDENTIFIER ::=  { isxModDistribution  2 }
@@ -9159,13 +9189,13 @@ upsAdvInputBypassNominalVoltage OBJECT-TYPE
        INDEX { upsAdvInputStatisticsIndex }
        ::= { upsAdvInputStatisticsTable 1 }
 
-   UpsAdvInputStatisticsEntry ::= SEQUENCE {
-       upsAdvInputStatisticsIndex         INTEGER,
-       upsAdvInputApparentPower           INTEGER,
-       upsAdvInputVoltageTHD              INTEGER,
-       upsAdvInputBypassVoltageTHD        INTEGER,
-       upsAdvInputPeakCurrent             INTEGER,
-       upsAdvInputBypassPeakCurrent       INTEGER
+UpsAdvInputStatisticsEntry ::= SEQUENCE {
+       upsAdvInputStatisticsIndex       INTEGER,
+       upsAdvInputApparentPower        	INTEGER,
+       upsAdvInputVoltageTHD            INTEGER,
+       upsAdvInputBypassVoltageTHD    	INTEGER,
+       upsAdvInputPeakCurrent           INTEGER,
+       upsAdvInputBypassPeakCurrent  	INTEGER
    }
 
    upsAdvInputStatisticsIndex OBJECT-TYPE
@@ -9181,7 +9211,7 @@ upsAdvInputApparentPower OBJECT-TYPE
    ACCESS read-only 
    STATUS mandatory 
    DESCRIPTION 
-      "The input apparent power of the UPS system in kVA." 
+      "The input apparent power(sum of all of the three phases) measured in kVA." 
    ::= { upsAdvInputStatisticsEntry 2 }
 
 upsAdvInputVoltageTHD OBJECT-TYPE 
@@ -9395,6 +9425,7 @@ upsAdvOutputApparentPower OBJECT-TYPE
       "The total output apparent power of all phases of the UPS system in VA."
    ::= { upsAdvOutput 9 }
 
+
    upsAdvOutputStatisticsTable OBJECT-TYPE
        SYNTAX     SEQUENCE OF UpsAdvOutputStatisticsEntry
        ACCESS     not-accessible
@@ -9417,8 +9448,9 @@ upsAdvOutputApparentPower OBJECT-TYPE
    UpsAdvOutputStatisticsEntry ::= SEQUENCE {
        upsAdvOutputStatisticsIndex         INTEGER,
        upsAdvOutputPeakCurrent             INTEGER,
-       upsAdvOutputCurrentTHD              INTEGER,
-       upsAdvOutputCrestFactor             INTEGER
+       upsAdvOutputCurrentTHD              INTEGER,        
+	   upsAdvOutputCrestFactor             INTEGER
+
    }
 
    upsAdvOutputStatisticsIndex OBJECT-TYPE
@@ -10248,6 +10280,7 @@ upsAdvConfigOutofSyncBypassTransferDelay OBJECT-TYPE
    ::= { upsAdvConfig 41 }
 
 
+  
 -- the upsSyncCtrlGroupConfig group
 
 upsSCGMembershipGroupNumber OBJECT-TYPE
@@ -10400,6 +10433,7 @@ upsSCGStatusTable OBJECT-TYPE
 
 -- the upsBasicState group
 
+
 upsBasicStateOutputState OBJECT-TYPE
    SYNTAX DisplayString
    ACCESS read-only
@@ -10495,6 +10529,7 @@ upsBasicStateOutputState OBJECT-TYPE
 
    ::= { upsBasicState 1 }
 
+
 -- the upsAdvState group
 
 upsAdvStateAbnormalConditions OBJECT-TYPE
@@ -11007,6 +11042,19 @@ upsAdvStateNumberoftimesNormal OBJECT-TYPE
       "Number of times the UPS was in normal operation.
        Since the last reset of statistical data."
    ::= { upsAdvState 12 }
+
+upsAdvStateEcomode OBJECT-TYPE
+   SYNTAX INTEGER {
+          upsOnEcoMode(1),
+          upsNotOnEcoMode(2)
+        }
+   ACCESS read-only
+   STATUS mandatory
+   DESCRIPTION
+      "Eco mode status.
+	   1: UPS is on Eco-mode
+	   2: UPS is not on Eco-mode."
+   ::= { upsAdvState 13 }
     
 -- the upsBasicControl group
 
@@ -11782,18 +11830,18 @@ currentStatus OBJECT-TYPE
        INDEX { upsPhaseInputPhaseTableIndex, upsPhaseInputPhaseIndex }
        ::= { upsPhaseInputPhaseTable 1 }
 
-   UpsPhaseInputPhaseEntry ::= SEQUENCE {
-       upsPhaseInputPhaseTableIndex    INTEGER,
-       upsPhaseInputPhaseIndex         INTEGER,
-       upsPhaseInputVoltage            INTEGER,
-       upsPhaseInputMaxVoltage         INTEGER,
-       upsPhaseInputMinVoltage         INTEGER,
-       upsPhaseInputCurrent            INTEGER,
-       upsPhaseInputMaxCurrent         INTEGER,
-       upsPhaseInputMinCurrent         INTEGER,
-       upsPhaseInputPower              INTEGER,
-       upsPhaseInputMaxPower           INTEGER,
-       upsPhaseInputMinPower           INTEGER
+ UpsPhaseInputPhaseEntry ::= SEQUENCE {
+       upsPhaseInputPhaseTableIndex    	INTEGER,
+       upsPhaseInputPhaseIndex         	INTEGER,
+       upsPhaseInputVoltage            	INTEGER,
+       upsPhaseInputMaxVoltage         	INTEGER,
+       upsPhaseInputMinVoltage         	INTEGER,
+       upsPhaseInputCurrent            	INTEGER,
+       upsPhaseInputMaxCurrent         	INTEGER,
+       upsPhaseInputMinCurrent         	INTEGER,
+       upsPhaseInputPower              	INTEGER,
+       upsPhaseInputMaxPower           	INTEGER,
+       upsPhaseInputMinPower           	INTEGER
    }
 
    upsPhaseInputPhaseTableIndex OBJECT-TYPE
@@ -12026,25 +12074,26 @@ currentStatus OBJECT-TYPE
        INDEX { upsPhaseOutputPhaseTableIndex, upsPhaseOutputPhaseIndex }
        ::= { upsPhaseOutputPhaseTable 1 }
 
-   UpsPhaseOutputPhaseEntry ::= SEQUENCE {
-       upsPhaseOutputPhaseTableIndex INTEGER,
-       upsPhaseOutputPhaseIndex      INTEGER,
-       upsPhaseOutputVoltage         INTEGER,
-       upsPhaseOutputCurrent         INTEGER,
-       upsPhaseOutputMaxCurrent      INTEGER,
-       upsPhaseOutputMinCurrent      INTEGER,
-       upsPhaseOutputLoad            INTEGER,
-       upsPhaseOutputMaxLoad         INTEGER,
-       upsPhaseOutputMinLoad         INTEGER,
-       upsPhaseOutputPercentLoad     INTEGER,
-       upsPhaseOutputMaxPercentLoad  INTEGER,
-       upsPhaseOutputMinPercentLoad  INTEGER,      
-       upsPhaseOutputPower           INTEGER,
-       upsPhaseOutputMaxPower        INTEGER,
-       upsPhaseOutputMinPower        INTEGER,
-       upsPhaseOutputPercentPower    INTEGER,
-       upsPhaseOutputMaxPercentPower INTEGER,
-       upsPhaseOutputMinPercentPower INTEGER
+    UpsPhaseOutputPhaseEntry ::= SEQUENCE {
+       upsPhaseOutputPhaseTableIndex   INTEGER,
+       upsPhaseOutputPhaseIndex        INTEGER,
+       upsPhaseOutputVoltage           INTEGER,
+       upsPhaseOutputCurrent           INTEGER,
+       upsPhaseOutputMaxCurrent        INTEGER,
+       upsPhaseOutputMinCurrent        INTEGER,
+       upsPhaseOutputLoad              INTEGER,
+       upsPhaseOutputMaxLoad           INTEGER,
+       upsPhaseOutputMinLoad           INTEGER,
+       upsPhaseOutputPercentLoad       INTEGER,
+       upsPhaseOutputMaxPercentLoad    INTEGER,
+       upsPhaseOutputMinPercentLoad    INTEGER,      
+       upsPhaseOutputPower             INTEGER,
+       upsPhaseOutputMaxPower          INTEGER,
+       upsPhaseOutputMinPower          INTEGER,
+       upsPhaseOutputPercentPower      INTEGER,
+       upsPhaseOutputMaxPercentPower   INTEGER,
+       upsPhaseOutputMinPercentPower   INTEGER,
+       upsPhaseOutputPowerFactor       INTEGER
    }
 
    upsPhaseOutputPhaseTableIndex OBJECT-TYPE
@@ -12234,6 +12283,14 @@ currentStatus OBJECT-TYPE
                unsupported by this UPS. Sampled every 30 seconds."
        ::= { upsPhaseOutputPhaseEntry 18 }
 
+    upsPhaseOutputPowerFactor  OBJECT-TYPE
+       SYNTAX     INTEGER
+       ACCESS     read-only
+       STATUS     mandatory
+       DESCRIPTION
+               "The Output power factor of the UPS in hundredth."
+       ::= { upsPhaseOutputPhaseEntry 19 }
+
 -- the upsOutletGroupStatus group
 
 upsOutletGroupStatusTableSize OBJECT-TYPE
@@ -12979,8 +13036,7 @@ UpsDiagBatteryEntry ::=
       upsDiagBatterySerialNumber    DisplayString,
       upsDiagBatteryFirmwareRev     DisplayString,
       upsDiagBatteryManufactureDate DisplayString,
-      upsDiagBatteryType            DisplayString,
-      upsDiagBatteryPolarity        INTEGER
+      upsDiagBatteryType            DisplayString
    }      
 
 upsDiagBatteryFrameIndex OBJECT-TYPE
@@ -13056,7 +13112,7 @@ upsDiagBatteryType OBJECT-TYPE
       "The battery type or rating for the battery."
    ::= { upsDiagBatteryEntry  7 }
 
-   
+
 -- the upsDiagnosticSubsystem group
 
 upsDiagSubSysFrameTableSize OBJECT-TYPE
@@ -14502,10 +14558,9 @@ upsDiagSubFeedBreakerTable OBJECT-TYPE
       DESCRIPTION
          "The maximum load before a critical alarm occurs.
          Expressed as percent of the subfeed breaker rating."
-      ::= { upsDiagSubFeedBreakerEntry 5 }
-
-
+      ::= { upsDiagSubFeedBreakerEntry 5 } 
 
+ 
 upsDiagMCCBBoxStatus OBJECT-TYPE
    SYNTAX INTEGER {
      unknown         (1),
@@ -15049,6 +15104,7 @@ upsParallelOutputTotalPercentLoad OBJECT-TYPE
         or -1 if it's unsupported by this UPS."
        ::= { upsParallelSystem 11 }
 
+ 
 
 -- the upsPhysicalLayout group
 upsIOFrameLayoutPositionID OBJECT-TYPE
@@ -18108,32 +18164,47 @@ rPDUIdentDeviceOutletLayout OBJECT-TYPE
       seqPhToNeu21PhToPh           (3),
       seqPhToPhGrouped             (4),
       seqPhToNGrouped              (5),
-      seqPToN1516PToPGrouped       (6)
+      seqPToN1516PToPGrouped       (6),
+      seqPhToPh2xGrouped           (7),
+      seqPhToN2xGrouped            (8),
+      seqNotApplicable             (9)
    }
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
       "Getting this OID will return outlet layout for the device.
 
-       SeqPhaseToNeutral(1) indicates outlet layout as follows:
+       seqPhaseToNeutral(1) indicates outlet layout as follows:
        1:1-N,2:2-N,3:3-N,4:1-N,5:2-N,...
 
-       SeqPhaseToPhase(2) indicates outlet layout as follows:
+       seqPhaseToPhase(2) indicates outlet layout as follows:
        1:1-2,2:2-3,3:3-1,4:1-2,5:2-3,...
 
-       SeqPhToNeu21PhToPh(3) indicates outlet layout as follows:
+       seqPhToNeu21PhToPh(3) indicates outlet layout as follows:
        1:1-N,2:2-N...21:3-N,22:1-2,23:2-3,24:3-1,...
 
-       SeqPhToPhGrouped(4) indicates outlet layout as follows:
-       Otlts1-8::(3-1),Otlts9-16::(2-3),Otlts17-24::(1-2).
+       seqPhToPhGrouped(4) indicates outlet layout as follows:
+       This unit has 3 outlet groups.  Group 1:1-2, Group 2:2-3, Group 3:3-1.
 
-       SeqPhToNGrouped(5) indicates outlet layout as follows:
-       Otlts1-[X-1]::(1-N),OtltsX-[Y-1]::(2-N),OtltsY-[Z]::(3-N).
+       seqPhToNGrouped(5) indicates outlet layout as follows:
+       This unit has 3 outlet groups.  Group 1:1-N, Group 2:2-N, Group 3:3-N.
 
-       SeqPToN1516PToPGrouped(6) indicates outlet layout as follows:
-       Otlts1-14::(1-2),Otlts15-16::(1-N),OtltsX-[Y-1]::(2-3),OtltsY-[Z]::(3-1)
+       seqPToN1516PToPGrouped(6) indicates outlet layout as follows:
+       This unit has 4 outlet groups. Group 1 (Outlets 1-14):1-2, 
+       Group 2 (Outlets 15-16):1-N, Group 3:2-3, Group 4:3-1.
 
-       X, Y, and Z represent Outlet numbers that vary by SKU."
+       seqPhToPh2xGrouped(7) indicates outlet layout as follows:
+       This unit has 6 outlet groups.  Group 1:1-2, Group 2:1-2, Group 3:2-3,
+       Group 4:2-3, Group 5:3-1, Group 6:3-1.
+
+       seqPhToN2xGrouped(8) indicates outlet layout as follows:
+       This unit has 6 outlet groups.  Group 1:1-N, Group 2:1-N, Group 3:2-N,
+       Group 4:2-N, Group 5:3-N, Group 6:3-N.
+
+       seqNotApplicable(9):
+       Outlet layout does not affect any of the user interfaces.
+       These SKUs may report seqNotApplicable(9) if there is 
+       not an exact outlet layout match available."
    ::= { rPDUIdent 13 } 
 
 rPDUIdentDeviceDisplayOrientation OBJECT-TYPE
@@ -19222,7 +19293,8 @@ rPDUOutletStatusTable OBJECT-TYPE
    STATUS mandatory
    DESCRIPTION
       "Allows for getting of status of individual outlets. The number of
-       entries is contained in the rPDUOutletDevNumCntrlOutlets OID."
+       entries is contained in the rPDUOutletDevNumCntrlOutlets OID or 
+       rPDUOutletDevMonitoredOutlets OID."
    ::= { rPDUOutletStatus 1 }
 
 rPDUOutletStatusEntry OBJECT-TYPE
@@ -19331,8 +19403,9 @@ rPDUOutletStatusLoad OBJECT-TYPE
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
-      "Getting this OID will return the measured Outlet load for an Outlet Monitored Rack PDU
-       in tenths of Amps."
+      "Getting this OID will return the measured Outlet load for 
+       an Outlet Monitored Rack PDU in tenths of Amps. For other 
+       models this OID is not supported."
    ::= { rPDUOutletStatusEntry 7 }
 
 
@@ -20126,7 +20199,10 @@ rPDU2DevicePropertiesOutletLayout OBJECT-TYPE
       seqPhToNeu21PhToPh           (3),
       seqPhToPhGrouped             (4),
       seqPhToNGrouped              (5),
-      seqPToN1516PToPGrouped       (6)
+      seqPToN1516PToPGrouped       (6),
+      seqPhToPh2xGrouped           (7),
+      seqPhToN2xGrouped            (8),
+      seqNotApplicable             (9)
    }
    ACCESS read-only
    STATUS mandatory
@@ -20143,15 +20219,27 @@ rPDU2DevicePropertiesOutletLayout OBJECT-TYPE
        1:1-N,2:2-N...21:3-N,22:1-2,23:2-3,24:3-1,...
 
        seqPhToPhGrouped(4) indicates outlet layout as follows:
-       Otlts1-8::(1-2),Otlts9-16::(2-3),Otlts17-24::(3-1).
+       This unit has 3 outlet groups.  Group 1:1-2, Group 2:2-3, Group 3:3-1.
 
        seqPhToNGrouped(5) indicates outlet layout as follows:
-       Otlts1-[X-1]::(1-N),OtltsX-[Y-1]::(2-N),OtltsY-[Z]::(3-N).
+       This unit has 3 outlet groups.  Group 1:1-N, Group 2:2-N, Group 3:3-N.
 
        seqPToN1516PToPGrouped(6) indicates outlet layout as follows:
-       Otlts1-14::(1-2),Otlts15-16::(1-N),OtltsX-[Y-1]::(2-3),OtltsY-[Z]::(3-1)
+       This unit has 4 outlet groups. Group 1 (Outlets 1-14):1-2, 
+       Group 2 (Outlets 15-16):1-N, Group 3:2-3, Group 4:3-1.
 
-       X, Y, and Z represent Outlet numbers that vary by SKU."
+       seqPhToPh2xGrouped(7) indicates outlet layout as follows:
+       This unit has 6 outlet groups.  Group 1:1-2, Group 2:1-2, Group 3:2-3,
+       Group 4:2-3, Group 5:3-1, Group 6:3-1.
+
+       seqPhToN2xGrouped(8) indicates outlet layout as follows:
+       This unit has 6 outlet groups.  Group 1:1-N, Group 2:1-N, Group 3:2-N,
+       Group 4:2-N, Group 5:3-N, Group 6:3-N.
+
+       seqNotApplicable(9):
+       Outlet layout does not affect any of the user interfaces for 
+       AP88XX SKUs.  These SKUs may report seqNotApplicable(9) if there is 
+       not an exact outlet layout match available."
    ::= { rPDU2DevicePropertiesEntry 11 }
 
 rPDU2DevicePropertiesMaxPhaseCurrentRating OBJECT-TYPE
@@ -20159,7 +20247,8 @@ rPDU2DevicePropertiesMaxPhaseCurrentRating OBJECT-TYPE
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
-      "Rated maximum current for Rack PDU"
+      "The maximum current rating, measured in Amps, for 
+       the Rack PDU"
    ::= { rPDU2DevicePropertiesEntry 12 }
 
 -- rPDU2 Device Status
@@ -20258,7 +20347,7 @@ rPDU2DeviceStatusPeakPowerTimestamp OBJECT-TYPE
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
-      "Indicates the date and time that peak power consumption occured"
+      "Indicates the date and time that peak power consumption occurred"
    ::= { rPDU2DeviceStatusEntry 7 }
 
 rPDU2DeviceStatusPeakPowerStartTime OBJECT-TYPE
@@ -20876,7 +20965,7 @@ RPDU2BankPropertiesEntry ::=
       rPDU2BankPropertiesIndex                  INTEGER,
       rPDU2BankPropertiesModule                 INTEGER,
       rPDU2BankPropertiesNumber                 INTEGER,
-      rPDU2BankPropertiesPhaseLayout            INTEGER
+      rPDU2BankPropertiesPhaseLayout            Rpdu2OutletPhaseLayoutType
    }
 
 rPDU2BankPropertiesIndex OBJECT-TYPE
@@ -21143,7 +21232,7 @@ RPDU2OutletSwitchedPropertiesEntry ::=
       rPDU2OutletSwitchedPropertiesModule       INTEGER,
       rPDU2OutletSwitchedPropertiesName         DisplayString,
       rPDU2OutletSwitchedPropertiesNumber       INTEGER,
-      rPDU2OutletSwitchedPropertiesPhaseLayout  INTEGER,
+      rPDU2OutletSwitchedPropertiesPhaseLayout  Rpdu2OutletPhaseLayoutType,
       rPDU2OutletSwitchedPropertiesBank         INTEGER
    }
 
@@ -21548,7 +21637,7 @@ RPDU2OutletMeteredPropertiesEntry ::=
       rPDU2OutletMeteredPropertiesModule      INTEGER,
       rPDU2OutletMeteredPropertiesName        DisplayString,
       rPDU2OutletMeteredPropertiesNumber      INTEGER,
-      rPDU2OutletMeteredPropertiesLayout      INTEGER,
+      rPDU2OutletMeteredPropertiesLayout      Rpdu2OutletPhaseLayoutType,
       rPDU2OutletMeteredPropertiesPowerRating INTEGER,
       rPDU2OutletMeteredPropertiesBank        INTEGER
    }
@@ -21711,7 +21800,7 @@ rPDU2OutletMeteredStatusState OBJECT-TYPE
        PDU metered outlet being queried"
    ::= { rPDU2OutletMeteredStatusEntry 5 }
 
-   rPDU2OutletMeteredStatusCurrent OBJECT-TYPE
+rPDU2OutletMeteredStatusCurrent OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
    STATUS mandatory
@@ -21745,7 +21834,7 @@ rPDU2OutletMeteredStatusPeakPowerTimestamp OBJECT-TYPE
    STATUS mandatory
    DESCRIPTION
       "Indicates the date and time that this metered
-       outlet's peak power consumption occured"
+       outlet's peak power consumption occurred"
    ::= { rPDU2OutletMeteredStatusEntry 9 }
 
 rPDU2OutletMeteredStatusPeakPowerStartTime OBJECT-TYPE
@@ -41408,7 +41497,6 @@ airIRRP100GroupConfigReheatDerivativeD OBJECT-TYPE
       "The derivative component of the reheat PID in hundredths."
    ::= { airIRRP100GroupConfig 9 }
 
-
 --  airIRRP100 AIR CONDITIONER UNIT Status
 
 airIRRP100UnitStatusOperateMode OBJECT-TYPE
@@ -43157,6 +43245,7 @@ airIRRP500UnitRunHoursHeater3 OBJECT-TYPE
    ::= { airIRRP500UnitRunHours 9 }
 
 
+
 --  airIRRP500 AIR CONDITIONER UNIT Service Intervals
 
 airIRRP500UnitServiceIntervalAirFilter OBJECT-TYPE
@@ -65194,7 +65283,7 @@ apcRelockTimeout TRAP-TYPE
    VARIABLES { mtrapargsString02, mtrapargsString03, 
                mtrapargsString04, mtrapargsInteger, mtrapargsString}
    DESCRIPTION
-      "SEVERE: A relock timout has occured.
+      "SEVERE: A relock timout has occurred.
         The first argument is the host device serial number.
         The second argument is the host device name.
         The third argument is the host device location.
@@ -68253,4 +68342,5 @@ upsHasNoValidFirmwareCleared TRAP-TYPE
    --#STATE OPERATIONAL
    ::= 763
 
+
 END