From 051a18434b68422a74ef85efbf696c9547c61425 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 12 May 2009 10:10:37 +0000
Subject: [PATCH] add new files

git-svn-id: http://www.observium.org/svn/observer/trunk@434 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/cisco-entity-sensors.inc.php | 52 +++++++++++++++++++
 includes/polling/cisco-mempool.inc.php        |  4 +-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100755 includes/polling/cisco-entity-sensors.inc.php

diff --git a/includes/polling/cisco-entity-sensors.inc.php b/includes/polling/cisco-entity-sensors.inc.php
new file mode 100755
index 0000000000..526379215a
--- /dev/null
+++ b/includes/polling/cisco-entity-sensors.inc.php
@@ -0,0 +1,52 @@
+<?
+
+$query = "SELECT * FROM entPhysical WHERE device_id = '" . $device['device_id'] . "' AND entPhysicalClass = 'sensor'";
+$sensors = mysql_query($query);
+while($sensor = mysql_fetch_array($sensors)) {
+
+  echo("Checking Entity Sensor " . $sensor['entPhysicalName'] . " - " . $sensor['cempsensorName']);
+
+  $oid = $sensor['entPhysicalIndex']; 
+
+  $sensor_cmd  = $config['snmpget'] . " -m CISCO-ENTITY-SENSOR-MIB -O Uqnv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
+  $sensor_cmd .= " entSensorValue.$oid entSensorStatus.$oid";
+
+  $sensor_data = trim(shell_exec($sensor_cmd));
+
+#  echo("$sensor_data");
+
+  list($entSensorValue, $entSensorStatus) = explode("\n", $sensor_data);
+
+  $rrd  = addslashes($config['rrd_dir'] . "/" . $device['hostname'] . "/ces-" . $oid . ".rrd");
+
+  if (!is_file($rrd)) {
+    `rrdtool create $rrd \
+     --step 300 \
+      DS:value:GAUGE:600:-1000:U \
+      RRA:AVERAGE:0.5:1:2304 \
+      RRA:AVERAGE:0.5:6:1536 \
+      RRA:AVERAGE:0.5:24:2268 \
+      RRA:AVERAGE:0.5:288:1890 \
+      RRA:MAX:0.5:1:2304 \
+      RRA:MAX:0.5:6:1536 \
+      RRA:MAX:0.5:24:2268 \
+      RRA:MAX:0.5:288:1890 \
+      RRA:MIN:0.5:1:2304 \
+      RRA:MIN:0.5:6:1536 \
+      RRA:MIN:0.5:24:2268 \
+      RRA:MIN:0.5:288:1890`;
+  }
+
+  $entSensorValue = entPhysical_scale($entSensorValue, $sensor['entSensorScale']);
+
+  $updatecmd = $config['rrdtool'] ." update $rrd N:$entSensorValue";
+  shell_exec($updatecmd);
+
+  $update_query = "UPDATE `entPhysical` SET entSensorValue='$entSensorValue', entSensorStatus='$entSensorStatus' WHERE `entPhysical_id` = '".$sensor['entPhysical_id']."'";
+  mysql_query($update_query);
+
+  echo($entSensorValue . " - " . $entSensorStatus . "\n");
+
+}
+
+?>
diff --git a/includes/polling/cisco-mempool.inc.php b/includes/polling/cisco-mempool.inc.php
index abe73bc106..e179543631 100755
--- a/includes/polling/cisco-mempool.inc.php
+++ b/includes/polling/cisco-mempool.inc.php
@@ -4,8 +4,8 @@ $query = "SELECT * FROM cempMemPool WHERE device_id = '" . $device['device_id']
 $pool_data = mysql_query($query);
 while($mempool = mysql_fetch_array($pool_data)) {
 
-  $entPhysicalName = mysql_result(mysql_query("SELECT entPhysicalName from entPhysical WHERE device_id = '".$device['device_id']."'
-                                               AND entPhysicalIndex = '".$mempool['entPhysicalIndex']."'"),0);
+  $entPhysicalName = @mysql_result(mysql_query("SELECT `entPhysicalName` from entPhysical WHERE device_id = '".$device['device_id']."'
+                                               AND `entPhysicalIndex` = '".$mempool['entPhysicalIndex']."'"),0);
 
   echo("Checking Mempool " . $entPhysicalName . " - " . $mempool['cempMemPoolName']);