From a15180333aa68505ebbd736b9b509ae8381af028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sorenrosiak@gmail.com>
Date: Mon, 13 Apr 2015 23:11:27 +0200
Subject: [PATCH 1/2] Minor APC Polling Changes

- Add InRow Serial ID
- Convert from OID to MIB names
---
 includes/polling/os/apc.inc.php | 46 +++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/includes/polling/os/apc.inc.php b/includes/polling/os/apc.inc.php
index 814860f4a..b64751d3d 100755
--- a/includes/polling/os/apc.inc.php
+++ b/includes/polling/os/apc.inc.php
@@ -1,58 +1,64 @@
 <?php
 
 # PDU
-$serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.6.0", "-OQv", "", ""),'"');
+$serial = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentSerialNumber.0", "-OQv", "", ""),'"');
 
 if ($serial == "")
 {
   # ATS
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.6.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::atsIdentSerialNumber.0", "-OQv", "", ""),'"');
 }
 
 if ($serial == "")
 {
   # UPS
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.2.3.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::upsAdvIdentSerialNumber.0", "-OQv", "", ""),'"');
 }
 
 if ($serial == "")
 {
   # Masterswitch/AP9606
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.5.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentSerialNumber.0", "-OQv", "", ""),'"');
+}
+
+if ($serial == "")
+{
+  # InRow chiller
+  $serial = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentSerialNumber.0", "-OQv", "", ""),'"');
 }
 
 /////////////////////
 
 # PDU
-$hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.5.0", "-OQv", "", ""),'"');
-$hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.2.0", "-OQv", "", ""),'"');
+$hardware = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentModelNumber.0", "-OQv", "", ""),'"');
+$hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::rPDUIdentHardwareRev.0", "-OQv", "", ""),'"');
 
 if ($hardware == " ")
 {
   # ATS
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.5.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::atsIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::atsIdentHardwareRev.0", "-OQv", "", ""),'"');
 }
 
 if ($hardware == " ")
 {
   # UPS
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.1.1.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.2.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::upsBasicIdentModel.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::upsAdvIdentFirmwareRevision.0", "-OQv", "", ""),'"');
 }
 
 if ($hardware == " ")
 {
   # Masterswitch/AP9606
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.4.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::sPDUIdentHardwareRev.0", "-OQv", "", ""),'"');
 }
 
 if ($hardware == " ")
 {
   # InRow chiller
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.13.3.2.2.1.4.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, ".1.3.6.1.4.1.318.1.1.13.3.2.2.1.7.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentHardwareRevision.0", "-OQv", "", ""),'"');
 }
 
 /////////////////////
@@ -63,18 +69,24 @@ $APPrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.2", "-OQv", "", ""
 if ($AOSrev == '')
 {
   # PDU
-  $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.3.0", "-OQv", "", ""),'"');
+  $version = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentFirmwareRev.0", "-OQv", "", ""),'"');
 
   if ($version == "")
   {
     # ATS
-    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.2.0", "-OQv", "", ""),'"');
+    $version = trim(snmp_get($device, "PowerNet-MIB::atsIdentFirmwareRev.0", "-OQv", "", ""),'"');
   }
 
   if ($version == "")
   {
     # Masterswitch/AP9606
-    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.2.0", "-OQv", "", ""),'"');
+    $version = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentFirmwareRev.0", "-OQv", "", ""),'"');
+  }
+
+  if ($version == "")
+  {
+    # InRow chiller
+    $version = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentFirmwareRevision.0", "-OQv", "", ""),'"');
   }
 }
 else

From 8fd0889e1368b558d6dd3283d58197dd5b51dbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sorenrosiak@gmail.com>
Date: Mon, 13 Apr 2015 23:29:04 +0200
Subject: [PATCH 2/2] APC InfraStruxure Detection

- Just basic s/n & hw detection
---
 includes/polling/os/apc.inc.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/includes/polling/os/apc.inc.php b/includes/polling/os/apc.inc.php
index b64751d3d..001f536d0 100755
--- a/includes/polling/os/apc.inc.php
+++ b/includes/polling/os/apc.inc.php
@@ -27,6 +27,12 @@ if ($serial == "")
   $serial = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentSerialNumber.0", "-OQv", "", ""),'"');
 }
 
+if ($serial == "")
+{
+  # InfraStruxure
+  $serial = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentSerialNumber.0", "-OQv", "", ""),'"');
+}
+
 /////////////////////
 
 # PDU
@@ -61,6 +67,13 @@ if ($hardware == " ")
   $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentHardwareRevision.0", "-OQv", "", ""),'"');
 }
 
+if ($hardware == " ")
+{
+  # InfraStruxure
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentMonitorCardHardwareRev.0", "-OQv", "", ""),'"');
+}
+
 /////////////////////
 
 $AOSrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.1", "-OQv", "", ""),'"');
@@ -88,6 +101,12 @@ if ($AOSrev == '')
     # InRow chiller
     $version = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentFirmwareRevision.0", "-OQv", "", ""),'"');
   }
+
+  if ($version == "")
+  {
+    # InfraStruxure
+    $version = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentMonitorCardFirmwareAppRev.0", "-OQv", "", ""),'"');
+  }
 }
 else
 {