From 39bbe0d67b10f921cc85320e59d5d7147d1f4ea2 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Thu, 15 Jul 2010 21:56:18 +0000
Subject: [PATCH] gamatronic ups fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@1360 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/voltages.inc.php | 54 ++++++++++++++---------------
 includes/static-config.php          |  2 ++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/includes/discovery/voltages.inc.php b/includes/discovery/voltages.inc.php
index 3ff956e070..061e1f8803 100755
--- a/includes/discovery/voltages.inc.php
+++ b/includes/discovery/voltages.inc.php
@@ -281,37 +281,35 @@ if ($device['os'] == "netmanplus")
   }
 }
 
+if ($device['os'] == "gamatronicups") 
+{
+  for($i = 1; $i <= 3 ;$i++) 
+  {
+    $volt_oid   = "GAMATRONIC-MIB::gamatronicLTD.5.4.1.1.2.$i";
+    $descr = "Input Phase $i";
+    $volt = snmp_get($device, $volt_oid, "-Oqv");
+    $type = "gamatronicups";
+    $precision = 1;
+    $index = $i;
+    $lowlimit = 0;
+    $limit = NULL;
 
-if ($device['os'] == "gamatronicups") {
+    echo discover_volt($valid_volt,$device, $volt_oid, $index, $type, $descr, $precision, $lowlimit, $limit, $volt);
+  }
 
-                for($i = 1; $i <= 3 ;$i++) {
-                        $volt_oid   = "GAMATRONIC-MIB::gamatronicLTD.5.4.1.1.2.$i";
-                        $descr = "Input Phase $i";
-                        $volt = snmp_get($device, $volt_oid, "-Oqv");
-                        $type = "gamatronicups";
-                        $precision = 1;
-                        $index = $i;
-                        $lowlimit = 0;
-                        $warnlimit = NULL;
-                        $limit = NULL;
+  for($i = 1; $i <= 3 ;$i++) 
+  {
+    $volt_oid   = "GAMATRONIC-MIB::gamatronicLTD.5.5.1.1.2.$i";
+    $descr = "Output Phase $i";
+    $volt = snmp_get($device, $volt_oid, "-Oqv");
+    $type = "gamatronicups";
+    $precision = 1;
+    $index = 100+$i;
+    $lowlimit = 0;
+    $limit = NULL;
 
-                        echo discover_volt($valid_volt,$device, $volt_oid, $index, $type, $descr, $precision, $lowlimit, $warnlimit, $limit, $volt);
-
-                }
-
-                for($i = 1; $i <= 3 ;$i++) {
-                        $volt_oid   = "GAMATRONIC-MIB::gamatronicLTD.5.5.1.1.2.$i";
-                        $descr = "Output Phase $i";
-                        $volt = snmp_get($device, $volt_oid, "-Oqv");
-                        $type = "gamatronicups";
-                        $precision = 1;
-                        $index = 100+$i;
-                        $lowlimit = 0;
-                        $warnlimit = NULL;
-                        $limit = NULL;
-
-                        echo discover_volt($valid_volt,$device, $volt_oid, $index, $type, $descr, $precision, $lowlimit, $warnlimit, $limit, $volt);
-                }
+    echo discover_volt($valid_volt,$device, $volt_oid, $index, $type, $descr, $precision, $lowlimit, $limit, $volt);
+  }
 
 }
 
diff --git a/includes/static-config.php b/includes/static-config.php
index 0eddef1d33..72d4e5bcc9 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -103,6 +103,8 @@ $config['os']['powerconnect']['type']   = "network";
 
 $config['os']['powervault']['text']   = "Dell PowerVault";
 
+$config['os']['gamatronicups']['text']   = "Gamatronic UPS Stack";
+
 $config['os']['airport']['type'] 	= "network";
 $config['os']['airport']['text']  	= "Apple AirPort";