many small fixes, hacky way to ignore no more variables, fix up supermicro sensor limits, loosen automatic sensor limit settings a bit

git-svn-id: http://www.observium.org/svn/observer/trunk@1675 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-08-13 13:17:53 +00:00
parent 61412a70f1
commit a1bf48e63e
9 changed files with 31 additions and 18 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
<?php
### Discover sensors
function discover_sensor (&$valid, $class, $device, $oid, $index, $type, $descr, $divisor = '1', $multiplier = '1', $low_limit = NULL, $low_warn_limit = NULL, $warn_limit = NULL, $high_limit = NULL, $current = NULL)
function discover_sensor (&$valid, $class, $device, $oid, $index, $type, $descr, $divisor = '1', $multiplier = '1', $low_limit = NULL, $low_warn_limit = NULL, $warn_limit = NULL, $high_limit = NULL, $current = NULL)
{
global $config, $debug;
if($debug) { echo("$oid, $index, $type, $descr, $precision\n"); }
@@ -83,7 +83,7 @@ function sensor_low_limit ($class, $current) {
$limit = $current * 0.7;
break;
case 'voltage':
$limit = $current * 0.95;
$limit = $current * 0.85;
break;
case 'humidity':
$limit = "70";
@@ -108,10 +108,10 @@ function sensor_limit ($class, $current) {
switch($class) {
case 'temperature':
$limit = $current * 1.20;
$limit = $current * 1.60;
break;
case 'voltage':
$limit = $current * 1.05;
$limit = $current * 1.15;
break;
case 'humidity':
$limit = "70";
@@ -120,7 +120,7 @@ function sensor_limit ($class, $current) {
$limit = $current * 1.05;
break;
case 'current':
$limit = $current * 1.20;
$limit = $current * 1.50;
break;
case 'fanspeed':
$limit = $current * 1.30;