fix: do not discover non-existent frequency sensors (#6199)

This commit is contained in:
Tony Murray
2017-03-15 04:15:27 -05:00
committed by Neil Lathwood
parent 004556dc01
commit 31dfe62965
2 changed files with 17 additions and 13 deletions

View File

@@ -21,19 +21,23 @@ for ($i = 1; $i <= $numPhase; $i++) {
}
$freq_oid = '.1.3.6.1.2.1.33.1.4.2.0';
$descr = 'Output';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid);
$current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor);
$type = 'rfc1628';
$current_freq = snmp_get($device, $freq_oid, '-Oqv');
if (is_numeric($current_freq)) {
$descr = 'Output';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid);
$type = 'rfc1628';
$index = '4.2.0';
$index = '4.2.0';
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current_freq / $divisor);
}
$freq_oid = '.1.3.6.1.2.1.33.1.5.1.0';
$descr = 'Bypass';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid);
$current = (snmp_get($device, $freq_oid, '-Oqv') / $divisor);
$type = 'rfc1628';
$current_freq = snmp_get($device, $freq_oid, '-Oqv');
if (is_numeric($current_freq)) {
$descr = 'Bypass';
$divisor = get_device_divisor($device, $pre_cache['poweralert_serial'], 'frequency', $freq_oid);
$type = 'rfc1628';
$index = '5.1.0';
$index = '5.1.0';
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current_freq / $divisor);
}