From d7765f7ab993bf604da05f6b46f7f56cc6c5767b Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Tue, 15 May 2012 18:18:20 +0000
Subject: [PATCH] remove commit from 3188

git-svn-id: http://www.observium.org/svn/observer/trunk@3192 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 +-
 7 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4410eb49b8..fe7d883a6f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -663,18 +663,6 @@ $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 03cefd5b16..1077b007ac 100644
--- a/includes/discovery/current/apc.inc.php
+++ b/includes/discovery/current/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-## APC PDUs
+## APC
 if ($device['os'] == "apc")
 {
   # PDU - Phase
diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/frequencies/apc.inc.php
index 782473cfda..05b550b28c 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" || $device['os'] == "apcups")
+if ($device['os'] == "apc")
 {
   $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" || $device['os'] == "apcups")
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/humidity/apc.inc.php b/includes/discovery/humidity/apc.inc.php
index 44bc25c3bf..35cade4f95 100644
--- a/includes/discovery/humidity/apc.inc.php
+++ b/includes/discovery/humidity/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc" || $device['os'] == "apcups")
+if ($device['os'] == "apc")
 {
   # 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 fd0b34ab85..0c2ab869e7 100644
--- a/includes/discovery/os/apc.inc.php
+++ b/includes/discovery/os/apc.inc.php
@@ -2,11 +2,10 @@
 
 if (!$os)
 {
-  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"; }
+  if (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 f5e182f1c7..bd7fa220c7 100644
--- a/includes/discovery/temperatures/apc.inc.php
+++ b/includes/discovery/temperatures/apc.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "apc" || $device['os'] == "apcups")
+if ($device['os'] == "apc")
 {
   $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 7496827a07..051ae4d966 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" || $device['os'] == "apcups")
+if ($device['os'] == "apc")
 {
   $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"); }