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: Standardise UPS divisors (#6942)

Browse Source 
Set default divisors for all devices and remove per-os overrides for them.
We should only use per-os overrides for non-standard behavior.

High possibility for breakage here if devices not listed here have non-standard behavior.
This commit is contained in:
Tony Murray
2017-07-13 12:09:56 -05:00
committed by Neil Lathwood
parent dcca74dcc4
commit c874fc5b1e
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -959,49 +959,28 @@ function get_device_divisor($device, $os_version, $sensor_type, $oid)
} else {
return 1;
}
} elseif ($sensor_type == 'voltage') {
return 1;
}
} elseif (($device['os'] == 'huaweiups') && ($sensor_type == 'frequency')) {
return 100;
} elseif (($device['os'] == 'netmanplus') && ($sensor_type == 'load')) {
return 1;
} elseif (($device['os'] == 'netmanplus') && ($sensor_type == 'voltage')) {
if (preg_match('/.1.3.6.1.2.1.33.1.2.5./', $oid)) {
return 10;
}
return 1;
} elseif ($device['os'] == 'generex-ups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
return 1;
}
} elseif ($device['os'] == 'apc-mgeups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
return 1;
}
} elseif ($device['os'] == 'ge-ups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
return 1;
}
} elseif ($device['os'] == 'eaton-mgeups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($device['os'] == 'huaweiups') {
if ($sensor_type == 'frequency') {
return 100;
}
} elseif ($device['os'] == 'hpe-rtups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.') && !starts_with($oid, '.1.3.6.1.2.1.33.1.3.3.1.3')) {
if ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.') && !starts_with($oid, '.1.3.6.1.2.1.33.1.3.3.1.3')) {
return 1;
}
}
return 10; //default
// UPS-MIB Defaults
if ($sensor_type == 'load') {
return 1;
}
if ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
return 1;
}
return 10;
}
/**