nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 16:01:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated thisisnotbullshit variable

Browse Source
This commit is contained in:
laf
2016-01-28 09:38:31 +00:00
parent d8c4916f6b
commit 3560a39b52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/sensors/entity-sensor.inc.php
+4 -4
View File
@@ -50,7 +50,7 @@ if (is_array($oids)) {
$descr = rewrite_entity_descr($descr); $descr = rewrite_entity_descr($descr);
} }
$thisisnotbullshit = check_entity_sensor($descr, $device); $valid = check_entity_sensor($descr, $device);
$type = $entitysensor[$entry['entPhySensorType']]; $type = $entitysensor[$entry['entPhySensorType']];
@@ -103,16 +103,16 @@ if (is_array($oids)) {
if ($type == 'temperature') { if ($type == 'temperature') {
if ($current > '200') { if ($current > '200') {
$thisisnotbullshit = false; $valid = false;
} $descr = preg_replace('/[T|t]emperature[|s]/', '', $descr); } $descr = preg_replace('/[T|t]emperature[|s]/', '', $descr);
} }
// echo($descr . "|" . $index . "|" .$current . "|" . $multiplier . "|" . $divisor ."|" . $entry['entPhySensorScale'] . "|" . $entry['entPhySensorPrecision'] . "\n"); // echo($descr . "|" . $index . "|" .$current . "|" . $multiplier . "|" . $divisor ."|" . $entry['entPhySensorScale'] . "|" . $entry['entPhySensorPrecision'] . "\n");
if ($current == '-127') { if ($current == '-127') {
$thisisnotbullshit = false; $valid = false;
} }
if ($thisisnotbullshit && dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE device_id = ? AND `sensor_class` = ? AND `sensor_type` = 'cisco-entity-sensor' AND `sensor_index` = ?", array($device['device_id'], $type, $index)) == '0') { if ($valid && dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE device_id = ? AND `sensor_class` = ? AND `sensor_type` = 'cisco-entity-sensor' AND `sensor_index` = ?", array($device['device_id'], $type, $index)) == '0') {
// Check to make sure we've not already seen this sensor via cisco's entity sensor mib // Check to make sure we've not already seen this sensor via cisco's entity sensor mib
discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, null, null, null, null, $current); discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, null, null, null, null, $current);
} }