From 1b0cd4a47696c4f7dfe2d0fe8cb4c0fce9c7b549 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 24 May 2011 17:59:18 +0000
Subject: [PATCH] add liebert OS and poll UPS-MIB for it

git-svn-id: http://www.observium.org/svn/observer/trunk@2358 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/defaults.inc.php                       | 4 ++++
 includes/discovery/current/rfc1628.inc.php      | 4 +---
 includes/discovery/frequencies/rfc1628.inc.php  | 6 ++----
 includes/discovery/os/liebert.inc.php           | 8 ++++++++
 includes/discovery/temperatures/rfc1628.inc.php | 4 ++--
 includes/discovery/voltages/rfc1628.inc.php     | 5 +----
 includes/static-config.php                      | 6 ++++++
 7 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 includes/discovery/os/liebert.inc.php

diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 2b09375b5..ccc286b99 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -361,5 +361,9 @@ $config['discovery_modules']['toner']                     = 1;
 $config['discovery_modules']['ucd-diskio']                = 1;
 $config['discovery_modules']['services']                  = 1;
 
+$config['modules_compat']['rfc1628']['liebert']           = 1;
+$config['modules_compat']['rfc1628']['netmanplus']        = 1;
+$config['modules_compat']['rfc1628']['deltaups']          = 1;
+$config['modules_compat']['rfc1628']['poweralert']        = 1;
 
 ?>
diff --git a/includes/discovery/current/rfc1628.inc.php b/includes/discovery/current/rfc1628.inc.php
index ede465dce..0230797a2 100644
--- a/includes/discovery/current/rfc1628.inc.php
+++ b/includes/discovery/current/rfc1628.inc.php
@@ -1,9 +1,7 @@
 <?php
 
-
-
 ## RFC1628 UPS
-if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
+if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modules_compat']['rfc1628'][$device['os']])
 {
   echo("RFC1628 ");
 
diff --git a/includes/discovery/frequencies/rfc1628.inc.php b/includes/discovery/frequencies/rfc1628.inc.php
index c04574eb2..fc5c30fd1 100644
--- a/includes/discovery/frequencies/rfc1628.inc.php
+++ b/includes/discovery/frequencies/rfc1628.inc.php
@@ -1,9 +1,7 @@
 <?php
 
-
-
-## RFC1628
-if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
+## RFC1628 UPS
+if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modules_compat']['rfc1628'][$device['os']])
 {
   echo("RFC1628 ");
 
diff --git a/includes/discovery/os/liebert.inc.php b/includes/discovery/os/liebert.inc.php
new file mode 100644
index 000000000..f13b39e2d
--- /dev/null
+++ b/includes/discovery/os/liebert.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.476.1.42")) { $os = "liebert"; }
+}
+
+?>
diff --git a/includes/discovery/temperatures/rfc1628.inc.php b/includes/discovery/temperatures/rfc1628.inc.php
index 035434507..382502f55 100644
--- a/includes/discovery/temperatures/rfc1628.inc.php
+++ b/includes/discovery/temperatures/rfc1628.inc.php
@@ -1,6 +1,6 @@
 <?php
-
-if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
+## RFC1628 UPS
+if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modules_compat']['rfc1628'][$device['os']])
 {
   $oids = snmp_walk($device, "1.3.6.1.2.1.33.1.2.7", "-Osqn", "UPS-MIB");
   if ($debug) { echo($oids."\n"); }
diff --git a/includes/discovery/voltages/rfc1628.inc.php b/includes/discovery/voltages/rfc1628.inc.php
index 1acb4388c..5d73caf41 100644
--- a/includes/discovery/voltages/rfc1628.inc.php
+++ b/includes/discovery/voltages/rfc1628.inc.php
@@ -1,10 +1,7 @@
 <?php
 
-
-
 ## RFC1628 UPS Voltages
-#if ($device['os'] == "netmanplus" || $device['os'] == "deltaups")
-if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
+if (isset($config['modules_compat']['rfc1628'][$device['os']]) && $config['modules_compat']['rfc1628'][$device['os']])
 {
   echo("RFC1628 ");
 
diff --git a/includes/static-config.php b/includes/static-config.php
index fcf57581b..22d6ea7c0 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -452,6 +452,12 @@ $config['os'][$os]['text']  		= "Delta UPS";
 $config['os'][$os]['type']  		= "power";
 $config['os'][$os]['icon']  		= "delta";
 
+$os = "liebert";
+$config['os'][$os]['text']              = "Liebert";
+$config['os'][$os]['type']              = "power";
+$config['os'][$os]['icon']              = "liebert";
+
+
 $os = "engenius";
 $config['os'][$os]['type'] 		= "network";
 $config['os'][$os]['text']  		= "EnGenius Access Point";