mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some issues with sensor limits (#9638)

Browse Source 
* Fix Zynos temp warn limit
And others, but this seems to be the only one that uses
remove some odd limit restriction in the poller

* More consistent rounding for sensor limits

* round all numeric limits to 10 digits

* update test data

* Remove complex calculation as negative limit values are already swapped as needed.
This commit is contained in:
Tony Murray
2019-01-10 19:48:37 -06:00
committed by GitHub
parent 4c058ae3b4
commit d277dee14d
21 changed files with 221 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
includes/discovery/functions.inc.php
View File

@@ -229,13 +229,9 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("Discover sensor: $oid, $index, $type, $descr, $poller_type, $divisor, $multiplier, $entPhysicalIndex, $current\n");
if (is_null($low_warn_limit) && !is_null($warn_limit)) {
// Warn limits only make sense when we have both a high and a low limit
$low_warn_limit = null;
$warn_limit = null;
} elseif (!is_null($warn_limit) && $low_warn_limit > $warn_limit) {
if (isset($warn_limit, $low_warn_limit) && $low_warn_limit > $warn_limit) {
// Fix high/low thresholds (i.e. on negative numbers)
list($warn_limit, $low_warn_limit) = array($low_warn_limit, $warn_limit);
list($warn_limit, $low_warn_limit) = [$low_warn_limit, $warn_limit];
}
if (dbFetchCell('SELECT COUNT(sensor_id) FROM `sensors` WHERE `poller_type`= ? AND `sensor_class` = ? AND `device_id` = ? AND sensor_type = ? AND `sensor_index` = ?', array($poller_type, $class, $device['device_id'], $type, (string)$index)) == '0') {
@@ -388,20 +384,16 @@ function sensor_low_limit($class, $current)
$limit = $current - 10;
break;
case 'voltage':
if ($current < 0) {
$limit = ($current * (1 + (sgn($current) * 0.15)));
} else {
$limit = ($current * (1 - (sgn($current) * 0.15)));
}
$limit = $current * 0.85;
break;
case 'humidity':
$limit = '30';
$limit = 30;
break;
case 'current':
$limit = null;
break;
case 'fanspeed':
$limit = ($current * 0.80);
$limit = $current * 0.80;
break;
case 'power':
$limit = null;
@@ -415,7 +407,7 @@ function sensor_low_limit($class, $current)
case 'frequency':
case 'pressure':
case 'cooling':
$limit = ($current * 0.95);
$limit = $current * 0.95;
break;
case 'delay':
case 'quality_factor':
@@ -425,6 +417,10 @@ function sensor_low_limit($class, $current)
case 'waterflow':
}//end switch
if (is_numeric($limit)) {
return round($limit, 11);
}
return $limit;
}
@@ -439,21 +435,17 @@ function sensor_limit($class, $current)
$limit = $current + 20;
break;
case 'voltage':
if ($current < 0) {
$limit = ($current * (1 - (sgn($current) * 0.15)));
} else {
$limit = ($current * (1 + (sgn($current) * 0.15)));
}
$limit = $current * 1.15;
break;
case 'humidity':
$limit = '70';
$limit = 70;
break;
case 'current':
case 'power':
$limit = ($current * 1.50);
$limit = $current * 1.50;
break;
case 'fanspeed':
$limit = ($current * 1.80);
$limit = $current * 1.80;
break;
case 'signal':
$limit = -30;
@@ -467,10 +459,14 @@ function sensor_limit($class, $current)
case 'frequency':
case 'pressure':
case 'cooling':
$limit = ($current * 1.05);
$limit = $current * 1.05;
break;
}//end switch
if (is_numeric($limit)) {
return round($limit, 11);
}
return $limit;
}