fix: Netbotz state sensors using wrong value (#7027)

* fix: Netbotz state sensors using wrong value * actual fix
librenms · Jul 14, 2017 · 83cb39a · 83cb39a
1 parent 898f59c
commit 83cb39a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
@@ -1043,14 +1043,14 @@ function can_skip_sensor($value, $data, $group)
         }
     }
 
-    $skip_values_lt = array_replace((array)$group['skip_value_lt'], (array)$data['skip_value_lt']);
+    $skip_value_lt = array_replace((array)$group['skip_value_lt'], (array)$data['skip_value_lt']);
     foreach ($skip_value_lt as $skip_value) {
         if ($value < $skip_value) {
             return true;
         }
     }
 
-    $skip_values_gt = array_reduce((array)$group['skip_value_gt'], (array)$data['skip_value_gt']);
+    $skip_value_gt = array_reduce((array)$group['skip_value_gt'], (array)$data['skip_value_gt']);
     foreach ($skip_value_gt as $skip_value) {
         if ($value > $skip_value) {
             return true;
@@ -1077,16 +1077,16 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
             $tmp_name = $data['oid'];
             $raw_data = $pre_cache[$tmp_name];
             foreach ($raw_data as $index => $snmp_data) {
-                $value = $snmp_data[$data['value']] ?: $snmp_data[$data['oid']];
+                $value = is_numeric($snmp_data[$data['value']]) ? $snmp_data[$data['value']] : ($snmp_data[$data['oid']] ?: false);
                 if (can_skip_sensor($value, $data, $sensor_options) === false && is_numeric($value)) {
                     $oid = $data['num_oid'] . $index;
                     if (isset($snmp_data[$data['descr']])) {
                         $descr = $snmp_data[$data['descr']];
                     } else {
                         $descr = str_replace('{{ $index }}', $index, $data['descr']);
                     }
-                    $divisor = $data['divisor'] ?: $sensor_options['divisor'] ?: 1;
-                    $multiplier = $data['multiplier'] ?: $sensor_options['multiplier'] ?: 1;
+                    $divisor = $data['divisor'] ?: ($sensor_options['divisor'] ?: 1);
+                    $multiplier = $data['multiplier'] ?: ($sensor_options['multiplier'] ?: 1);
                     $low_limit = $data['low_limit'] ?: 'null';
                     $low_warn_limit = $data['low_warn_limit'] ?: 'null';
                     $warn_limit = $data['warn_limit'] ?: 'null';