From 594e3f042eb22216fc5abfe4e0a236de9e313a67 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 12 Dec 2011 15:22:31 +0000
Subject: [PATCH] THIS. IS. SPARTA. -63dBm.

git-svn-id: http://www.observium.org/svn/observer/trunk@2774 61d68cd4-352d-0410-923a-c4978735b2b8
---
 attic/cisco_entity_sensor.inc.php              | 3 ++-
 html/pages/device/health.inc.php               | 3 +++
 html/pages/health.inc.php                      | 2 ++
 includes/discovery/cisco-entity-sensor.inc.php | 1 +
 includes/polling/sensors.inc.php               | 3 ++-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/attic/cisco_entity_sensor.inc.php b/attic/cisco_entity_sensor.inc.php
index c43368f5c6..85f2cdb715 100644
--- a/attic/cisco_entity_sensor.inc.php
+++ b/attic/cisco_entity_sensor.inc.php
@@ -7,6 +7,7 @@ switch ($sensor['entSensorType'])
   case 'celsius':
   case 'watts':
   case 'voltsDC':
+  case 'dBm':
   case 'amperes':
     $scale_min = "0";
     break;
@@ -31,4 +32,4 @@ $rrd_options .= " GPRINT:max:MAX:%5.2lf%s";
 $rrd_options .= " GPRINT:max:MAX:%5.2lf%s";
 $rrd_options .= " GPRINT:avg:LAST:%5.2lf%s";
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php
index a0e61b34fa..4cc8429805 100644
--- a/html/pages/device/health.inc.php
+++ b/html/pages/device/health.inc.php
@@ -12,6 +12,7 @@ $volts        = dbFetchCell("select count(*) from sensors WHERE sensor_class='vo
 $current      = dbFetchCell("select count(*) from sensors WHERE sensor_class='current' AND device_id = ?", array($device['device_id']));
 $freqs        = dbFetchCell("select count(*) from sensors WHERE sensor_class='frequency' AND device_id = ?", array($device['device_id']));
 $power        = dbFetchCell("select count(*) from sensors WHERE sensor_class='power' AND device_id = ?", array($device['device_id']));
+$dBm        = dbFetchCell("select count(*) from sensors WHERE sensor_class='dBm' AND device_id = ?", array($device['device_id']));
 
 unset($datas);
 $datas[] = 'overview';
@@ -26,6 +27,7 @@ if ($volts) { $datas[] = 'voltage'; }
 if ($freqs) { $datas[] = 'frequency'; }
 if ($current) { $datas[] = 'current'; }
 if ($power) { $datas[] = 'power'; }
+if ($dBm) { $datas[] = 'dBm'; }
 
 $type_text['overview'] = "Overview";
 $type_text['temperature'] = "Temperature";
@@ -39,6 +41,7 @@ $type_text['fanspeed'] = "Fanspeed";
 $type_text['frequency'] = "Frequency";
 $type_text['current'] = "Current";
 $type_text['power'] = "Power";
+$type_text['dBm'] = "dBm";
 
 $link_array = array('page'    => 'device',
                     'device'  => $device['device_id'],
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index e16ec6b090..2945f88eea 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -8,6 +8,7 @@ if ($used_sensors['voltage']) $datas[] = 'voltage';
 if ($used_sensors['frequency']) $datas[] = 'frequency';
 if ($used_sensors['current']) $datas[] = 'current';
 if ($used_sensors['power']) $datas[] = 'power';
+if ($used_sensors['dBm']) $datas[] = 'dBm';
 
 # FIXME generalize -> static-config ?
 $type_text['overview'] = "Overview";
@@ -23,6 +24,7 @@ $type_text['frequency'] = "Frequency";
 $type_text['current'] = "Current";
 $type_text['power'] = "Power";
 $type_text['toner'] = "Toner";
+$type_text['dBm'] = "dBm";
 
 if (!$vars['metric']) { $vars['metric'] = "processor"; }
 if (!$vars['view']) { $vars['view'] = "detail"; }
diff --git a/includes/discovery/cisco-entity-sensor.inc.php b/includes/discovery/cisco-entity-sensor.inc.php
index cd319fb43d..73509a837c 100644
--- a/includes/discovery/cisco-entity-sensor.inc.php
+++ b/includes/discovery/cisco-entity-sensor.inc.php
@@ -46,6 +46,7 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
   $entitysensor['rpm']       = "fanspeed";
   $entitysensor['celsius']   = "temperature";
   $entitysensor['watts']     = "power";
+  $entitysensor['dBm']       = "dbm";
 
   if (is_array($oids))
   {
diff --git a/includes/polling/sensors.inc.php b/includes/polling/sensors.inc.php
index 9c7396f5c8..40715a2e18 100644
--- a/includes/polling/sensors.inc.php
+++ b/includes/polling/sensors.inc.php
@@ -19,7 +19,8 @@ $supported_sensors = array('current' => 'A',
                            'fanspeed' => 'rpm',
                            'power' => 'W',
                            'voltage' => 'V',
-                           'temperature' => 'C');
+                           'temperature' => 'C',
+                           'dbm' => 'dBm');
 
 foreach ($supported_sensors as $sensor_type => $sensor_unit)
 {