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

Fixed a few small bugs, introduced by the Poller tidy up of laf (#5930)

Browse Source 
* Fix for #5734 - incorrect hostname in the mouse-over of the services in the availability-map

* Fixed a few small bugs, introduced by the Poller tidy up of laf
This commit is contained in:
Robert Verspuy
2017-02-17 09:51:48 +01:00
committed by Neil Lathwood
parent 872eac10aa
commit 8b2bc22272
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/polling/functions.inc.php
View File

@ -56,7 +56,7 @@ function poll_sensor($device, $class)
$misc_sensors = array();
$all_sensors = array();
foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = '?' AND `device_id` = ?", array($class, $device['device_id'])) as $sensor) {
foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ?", array($class, $device['device_id'])) as $sensor) {
if ($sensor['poller_type'] == 'agent') {
$misc_sensors[] = $sensor;
} elseif ($sensor['poller_type'] == 'ipmi') {
@ -176,7 +176,7 @@ function poll_sensor($device, $class)
if ($sensor['sensor_class'] == 'state' && $sensor['sensor_current'] != $sensor_value) {
log_event($class . ' sensor has changed from ' . $sensor['sensor_current'] . ' to ' . $sensor_value, $device, $class, 3, $sensor['sensor_id']);
}
dbUpdate(array('sensor_current' => $sensor_value, 'sensor_prev' => $sensor['sensor_current'], 'lastupdate' => array('NOW()')), 'sensors', "`sensor_class` = '?' AND `sensor_id` = ?", array($class,$sensor['sensor_id']));
dbUpdate(array('sensor_current' => $sensor_value, 'sensor_prev' => $sensor['sensor_current'], 'lastupdate' => array('NOW()')), 'sensors', "`sensor_class` = ? AND `sensor_id` = ?", array($class,$sensor['sensor_id']));
unset($supported_sensors);
}
}//end poll_sensor()

2
includes/polling/sensors.inc.php
View File

@ -13,7 +13,7 @@
$sensors = dbFetchRows("SELECT `sensor_class` FROM `sensors` WHERE `device_id` = ? GROUP BY `sensor_class`", array($device['device_id']));
foreach ($sensors as $sensor_type) {
poll_sensor($device, $sensor_type);
poll_sensor($device, $sensor_type['sensor_class']);
}
unset($sensors, $sensor_type);