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

moved roundme function to common.php and enabled it to round to 10th/100th/1000th based on of 10/100/1000 input

Browse Source
This commit is contained in:
Rasmus Aberg
2015-07-21 17:08:09 +02:00
parent 80cdbfcb4f
commit d005b601b9
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
includes/common.php
View File

@@ -699,4 +699,19 @@ function get_graph_subtypes($type) {
return $types; return $types;
} }
/*
* @return rounded value to 10th/100th/1000th depending on input (valid: 10, 100, 1000)
*/
function round_Nth($val = 0, $round_to) {
if (($round_to == "10") || ($round_to == "100") || ($round_to == "1000")) {
$diff = $val % $round_to;
if ($diff >= ($round_to / 2)) {
$ret = $val + ($round_to-$diff);
} else {
$ret = $val - $diff;
}
return $ret;
}
}
?> ?>

26
includes/discovery/fanspeeds/extreme.inc.php
View File

@@ -1,17 +1,6 @@
<?php <?php
if ($device['os'] == 'xos') { if ($device['os'] == 'xos') {
// Function used to round limit values to hundreds to avoid h/w/l limits being changed on every discovery as a change of 1rpm for fan speed would cause the limit values to change since they're dynamically calculated
function roundme($val = 0) {
$diff = $val % 100;
if ($diff >= 50) {
$ret = $val + (100-$diff);
} else {
$ret = $val - $diff;
}
return $ret;
}
echo(" EXTREME-BASE-MIB "); echo(" EXTREME-BASE-MIB ");
// Fan Speed // Fan Speed
@@ -24,13 +13,14 @@ if ($device['os'] == 'xos') {
$index = $matches[1]; $index = $matches[1];
// substract 100 from index to start from 1 instead of 101 // substract 100 from index to start from 1 instead of 101
$modindex = ($index - 100); $modindex = ($index - 100);
$oid = "1.3.6.1.4.1.1916.1.1.1.9.1.4.$index"; $oid = "1.3.6.1.4.1.1916.1.1.1.9.1.4.$index";
$value = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB'); $value = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
$descr = "Fan Speed $modindex"; $descr = "Fan Speed $modindex";
$high_limit = roundme($value * 1.5); // round function used to round limit values to hundreds to avoid h/w/l limits being changed on every discovery as a change of 1rpm for fan speed would cause the limit values to change since they're dynamically calculated
$high_warn_limit = roundme($value * 1.25); $high_limit = round_Nth(($value * 1.5), 100);
$low_warn_limit = roundme($value * 0.75); $high_warn_limit = round_Nth(($value * 1.25), 100);
$low_limit = roundme($value * 0.5); $low_warn_limit = round_Nth(($value * 0.75), 100);
$low_limit = round_Nth(($value * 0.5), 100);
if (is_numeric($value)) { if (is_numeric($value)) {
discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'extreme-fanspeed', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'extreme-fanspeed', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
} }