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: Fix Generex voltage sensor divisor (#6156)

Browse Source 
* Fix Generex votage sensor divisor and add an exclusion option

* Allow OID to be used to figure out if we need to change the divisor.

* Missed current and found bugs while I was there.

* Use returns swap oid logic
This commit is contained in:
FTBZ
2017-03-10 04:47:58 +01:00
committed by Tony Murray
parent 5a5c96b118
commit 1d80a0d2a6
5 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -891,42 +891,50 @@ function avtech_add_sensor($device, $sensor)
return true; return true;
} }
/** /**
* @param $device * Get the device divisor, account for device specific quirks
* @param $serial * The default divisor is 10
* @param $sensor *
* @param array $device device array
* @param string $os_version firmware version poweralert quirks
* @param string $sensor_type the type of this sensor
* @param string $oid the OID of this sensor
* @return int * @return int
*/ */
function get_device_divisor($device, $serial, $sensor) function get_device_divisor($device, $os_version, $sensor_type, $oid)
{ {
if ($device['os'] == 'poweralert') { if ($device['os'] == 'poweralert') {
if ($sensor == 'current' || $sensor == 'frequencies') { if ($sensor_type == 'current' || $sensor_type == 'frequencies') {
if (version_compare($serial, '12.06.0068', '>=')) { if (version_compare($os_version, '12.06.0068', '>=')) {
$divisor = 10; return 10;
} elseif (version_compare($serial, '12.04.0055', '=')) { } elseif (version_compare($os_version, '12.04.0055', '=')) {
$divisor = 10; return 10;
} elseif (version_compare($serial, '12.04.0056', '>=')) { } elseif (version_compare($os_version, '12.04.0056', '>=')) {
$divisor = 1; return 1;
} }
} elseif ($sensor == 'load') { } elseif ($sensor_type == 'load') {
if (version_compare($serial, '12.06.0064', '=')) { if (version_compare($os_version, '12.06.0064', '=')) {
$divisor = 10; return 10;
} else { } else {
$divisor = 1; return 1;
} }
} elseif ($sensor == 'voltages') { } elseif ($sensor_type == 'voltages') {
$divisor = 1; return 1;
}
} elseif (($device['os'] == 'huaweiups') && ($sensor_type == 'frequencies')) {
return 100;
} elseif (($device['os'] == 'netmanplus') && ($sensor_type == 'voltages')) {
return 1;
} elseif ($device['os'] == 'generex-ups') {
if ($sensor_type == 'load') {
return 1;
} elseif ($sensor_type == 'voltages' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
return 1;
} }
} elseif (($device['os'] == 'huaweiups') && ($sensor == 'frequencies')) {
$divisor = 100;
} elseif (($device['os'] == 'netmanplus') && ($sensor == 'voltages')) {
$divisor = 1;
} elseif (($device['os'] == 'generex-ups') && ($sensor == 'load')) {
$divisor = 1;
} else {
$divisor = 10;
} }
return $divisor;
return 10; //default
} }
/** /**

18
includes/discovery/sensors/current/rfc1628.inc.php
View File

@@ -1,7 +1,5 @@
<?php <?php
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'current');
echo 'RFC1628 '; echo 'RFC1628 ';
$oids = snmp_walk($device, '.1.3.6.1.2.1.33.1.2.6', '-Osqn', 'UPS-MIB'); $oids = snmp_walk($device, '.1.3.6.1.2.1.33.1.2.6', '-Osqn', 'UPS-MIB');
@@ -15,8 +13,8 @@ foreach (explode("\n", $oids) as $data) {
$split_oid = explode('.', $oid); $split_oid = explode('.', $oid);
$current_id = $split_oid[(count($split_oid) - 1)]; $current_id = $split_oid[(count($split_oid) - 1)];
$current_oid = ".1.3.6.1.2.1.33.1.2.6.$current_id"; $current_oid = ".1.3.6.1.2.1.33.1.2.6.$current_id";
$precision = 10; $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'current', $current_oid);
$current = (snmp_get($device, $current_oid, '-O vq') / $precision); $current = (snmp_get($device, $current_oid, '-O vq') / $divisor);
$descr = 'Battery'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($current_id + 1)); $descr = 'Battery'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($current_id + 1));
$type = 'rfc1628'; $type = 'rfc1628';
$index = (500 + $current_id); $index = (500 + $current_id);
@@ -36,8 +34,8 @@ for ($i = 1; $i <= $numPhase; $i++) {
$descr .= " Phase $i"; $descr .= " Phase $i";
} }
$precision = 10; $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'current', $current_oid);
$current = (snmp_get($device, $current_oid, '-Oqv') / $precision); $current = (snmp_get($device, $current_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';
$index = $i; $index = $i;
@@ -55,8 +53,8 @@ for ($i = 1; $i <= $numPhase; $i++) {
$descr .= " Phase $i"; $descr .= " Phase $i";
} }
$precision = 10; $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'current', $current_oid);
$current = (snmp_get($device, $current_oid, '-Oqv') / $precision); $current = (snmp_get($device, $current_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';
$index = (100 + $i); $index = (100 + $i);
@@ -74,8 +72,8 @@ for ($i = 1; $i <= $numPhase; $i++) {
$descr .= " Phase $i"; $descr .= " Phase $i";
} }
$precision = 10; $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'current', $current_oid);
$current = (snmp_get($device, $current_oid, '-Oqv') / $precision); $current = (snmp_get($device, $current_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';
$index = (200 + $i); $index = (200 + $i);

6
includes/discovery/sensors/frequencies/rfc1628.inc.php
View File

@@ -12,7 +12,7 @@ for ($i = 1; $i <= $numPhase; $i++) {
if ($numPhase > 1) { if ($numPhase > 1) {
$descr .= " Phase $i"; $descr .= " Phase $i";
} }
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid);
$current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';
@@ -22,7 +22,7 @@ for ($i = 1; $i <= $numPhase; $i++) {
$freq_oid = '.1.3.6.1.2.1.33.1.4.2.0'; $freq_oid = '.1.3.6.1.2.1.33.1.4.2.0';
$descr = 'Output'; $descr = 'Output';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid);
$current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';
@@ -31,7 +31,7 @@ discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type
$freq_oid = '.1.3.6.1.2.1.33.1.5.1.0'; $freq_oid = '.1.3.6.1.2.1.33.1.5.1.0';
$descr = 'Bypass'; $descr = 'Bypass';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequencies', $freq_oid);
$current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor);
$type = 'rfc1628'; $type = 'rfc1628';

2
includes/discovery/sensors/load/rfc1628.inc.php
View File

@@ -11,9 +11,9 @@ foreach (explode("\n", $oids) as $data) {
if ($data) { if ($data) {
list($oid,$descr) = explode(' ', $data, 2); list($oid,$descr) = explode(' ', $data, 2);
$split_oid = explode('.', $oid); $split_oid = explode('.', $oid);
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'load');
$current_id = $split_oid[(count($split_oid) - 1)]; $current_id = $split_oid[(count($split_oid) - 1)];
$current_oid = ".1.3.6.1.2.1.33.1.4.4.1.5.$current_id"; $current_oid = ".1.3.6.1.2.1.33.1.4.4.1.5.$current_id";
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'load', $current_oid);
$current = (snmp_get($device, $current_oid, '-O vq') / $divisor); $current = (snmp_get($device, $current_oid, '-O vq') / $divisor);
$descr = 'Percentage load'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($current_id + 1)); $descr = 'Percentage load'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($current_id + 1));
$type = 'rfc1628'; $type = 'rfc1628';

10
includes/discovery/sensors/voltages/rfc1628.inc.php
View File

@@ -13,7 +13,7 @@ foreach (explode("\n", $oids) as $data) {
$split_oid = explode('.', $oid); $split_oid = explode('.', $oid);
$volt_id = $split_oid[(count($split_oid) - 1)]; $volt_id = $split_oid[(count($split_oid) - 1)];
$volt_oid = ".1.3.6.1.2.1.33.1.2.5.$volt_id"; $volt_oid = ".1.3.6.1.2.1.33.1.2.5.$volt_id";
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages', $volt_oid);
$volt = (snmp_get($device, $volt_oid, '-O vq') / $divisor); $volt = (snmp_get($device, $volt_oid, '-O vq') / $divisor);
$descr = 'Battery'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($volt_id + 1)); $descr = 'Battery'.(count(explode("\n", $oids)) == 1 ? '' : ' '.($volt_id + 1));
@@ -36,7 +36,7 @@ for ($i = 1; $i <= $numPhase; $i++) {
} }
$type = 'rfc1628'; $type = 'rfc1628';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages', $volt_oid);
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$index = $i; $index = $i;
@@ -56,10 +56,10 @@ for ($i = 1; $i <= $numPhase; $i++) {
} }
$type = 'rfc1628'; $type = 'rfc1628';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages', $volt_oid);
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$divisor = get_device_divisor($device, $_tmp_serial, 'voltages');
$index = (100 + $i); $index = (100 + $i);
discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
@@ -77,7 +77,7 @@ for ($i = 1; $i <= $numPhase; $i++) {
} }
$type = 'rfc1628'; $type = 'rfc1628';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages'); $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'voltages', $volt_oid);
$current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor); $current = (snmp_get($device, $volt_oid, '-Oqv') / $divisor);
$index = (200 + $i); $index = (200 + $i);