THIS. IS. SPARTA. -63dBm.

git-svn-id: http://www.observium.org/svn/observer/trunk@2774 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-12-12 15:22:31 +00:00
parent 349290a037
commit 594e3f042e
5 changed files with 10 additions and 2 deletions

View File

@@ -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";
?>
?>

View File

@@ -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'],

View File

@@ -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"; }

View File

@@ -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))
{

View File

@@ -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)
{