From db6c9cb9d268d5698bcd1b912b0aa77f9b1fea09 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Wed, 15 Feb 2012 17:14:58 +0000
Subject: [PATCH] add poller/discovery for dell powerconnect cpu

git-svn-id: http://www.observium.org/svn/observer/trunk@2864 61d68cd4-352d-0410-923a-c4978735b2b8
---
 .../discovery/processors/powerconnect.inc.php | 23 +++++++++++++++++++
 includes/polling/processors.inc.php           |  2 +-
 .../polling/processors/powerconnect.inc.php   | 11 +++++++++
 .../ucd-old.inc.php}                          |  0
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 includes/discovery/processors/powerconnect.inc.php
 create mode 100644 includes/polling/processors/powerconnect.inc.php
 rename includes/polling/{processors-ucd-old.inc.php => processors/ucd-old.inc.php} (100%)

diff --git a/includes/discovery/processors/powerconnect.inc.php b/includes/discovery/processors/powerconnect.inc.php
new file mode 100755
index 000000000..1732879c6
--- /dev/null
+++ b/includes/discovery/processors/powerconnect.inc.php
@@ -0,0 +1,23 @@
+<?php
+
+##
+##  Hardcoded discovery of cpu usage on Dell Powerconnect devices.
+##
+##  Dell-Vendor-MIB::dellLanExtension.6132.1.1.1.1.4.4.0 = STRING: "5 Sec (6.99%),    1 Min (6.72%),   5 Min (9.06%)"
+
+if ($device['os'] == "powerconnect")
+{
+  echo("Powerconnect : ");
+
+  $descr = "Processor";
+  $usage = trim(snmp_get($device, "dellLanExtension.6132.1.1.1.1.4.4.0", "-OQUvs", "Dell-Vendor-MIB"),'"');
+
+  if (substr($usage,0,5) == "5 Sec")
+  {
+    discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.4.0", "0", "powerconnect", $descr, "1", $usage, NULL, NULL);
+  }
+}
+
+unset ($processors_array);
+
+?>
diff --git a/includes/polling/processors.inc.php b/includes/polling/processors.inc.php
index 9621397d8..bf51422b3 100755
--- a/includes/polling/processors.inc.php
+++ b/includes/polling/processors.inc.php
@@ -4,7 +4,7 @@ foreach (dbFetchRows("SELECT * FROM processors WHERE device_id = ?", array($devi
 {
   echo("Processor " . $processor['processor_descr'] . "... ");
 
-  $file = $config['install_dir']."/includes/polling/processors-".$processor['processor_type'].".inc.php";
+  $file = $config['install_dir']."/includes/polling/processors/".$processor['processor_type'].".inc.php";
   if (is_file($file))
   {
     include($file);
diff --git a/includes/polling/processors/powerconnect.inc.php b/includes/polling/processors/powerconnect.inc.php
new file mode 100644
index 000000000..7011acd2b
--- /dev/null
+++ b/includes/polling/processors/powerconnect.inc.php
@@ -0,0 +1,11 @@
+<?php
+
+# "5 Sec (7.31%),    1 Min (14.46%),   5 Min (10.90%)"
+
+$values = trim(snmp_get($device, "dellLanExtension.6132.1.1.1.1.4.4.0", "-OvQ", "Dell-Vendor-MIB"),'"');
+
+preg_match('/5 Sec \((.*)%\),.*1 Min \((.*)%\),.*5 Min \((.*)%\)$/', $values, $matches);
+
+$proc = $matches[3];
+
+?>
diff --git a/includes/polling/processors-ucd-old.inc.php b/includes/polling/processors/ucd-old.inc.php
similarity index 100%
rename from includes/polling/processors-ucd-old.inc.php
rename to includes/polling/processors/ucd-old.inc.php