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

small speedup to entity polling

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1374 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-17 12:58:30 +00:00
parent e0944c233e
commit f4d280ece5
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
includes/discovery/entity-physical.inc.php
View File

@@ -6,9 +6,9 @@
if($config['enable_inventory']) {
$empty = array();
$entity_array = snmpwalk_cache_oid("entPhysicalEntry", $device, $empty, "ENTITY-MIB");
$entity_array = snmpwalk_cache_oid("entSensorValues", $device, $entity_array, "CISCO-ENTITY-SENSOR-MIB");
$entity_array = array();
$entity_array = snmpwalk_cache_oid("entPhysicalEntry", $device, $entity_array, "ENTITY-MIB");
#$entity_array = snmpwalk_cache_oid("entSensorValues", $device, $entity_array, "CISCO-ENTITY-SENSOR-MIB");
if(!$entity_array[$device['device_id']]) { $entity_array[$device['device_id']] = array(); }
@@ -67,25 +67,26 @@
echo("+");
}
if($entPhysicalClass == "sensor")
{
$entSensorType = $entry['entSensorType'];
$entSensorScale = $entry['entSensorScale'];
$entSensorPrecision = $entry['entSensorPrecision'];
$entSensorValueUpdateRate = $entry['entSensorValueUpdateRate'];
$entSensorMeasuredEntity = $entry['entSensorMeasuredEntity'];
# if($entPhysicalClass == "sensor")
# {
# $entSensorType = $entry['entSensorType'];
# $entSensorScale = $entry['entSensorScale'];
# $entSensorPrecision = $entry['entSensorPrecision'];
# $entSensorValueUpdateRate = $entry['entSensorValueUpdateRate'];
# $entSensorMeasuredEntity = $entry['entSensorMeasuredEntity'];
if($config['allow_entity_sensor'][$entSensorType]) {
$sql = "UPDATE `entPhysical` SET entSensorType = '$entSensorType', entSensorScale = '$entSensorScale', entSensorPrecision = '$entSensorPrecision', ";
$sql .= " entSensorMeasuredEntity = '$entSensorMeasuredEntity'";
$sql .= " WHERE device_id = '".$device['device_id']."' AND entPhysicalIndex = '$entPhysicalIndex'";
} else {
echo("!");
$sql = "UPDATE `entPhysical` SET entSensorType = '', entSensorScale = '', entSensorPrecision = '', entSensorMeasuredEntity = ''";
$sql .= " WHERE device_id = '".$device['device_id']."' AND entPhysicalIndex = '$entPhysicalIndex'";
}
mysql_query($sql);
}
# if($config['allow_entity_sensor'][$entSensorType]) {
# $sql = "UPDATE `entPhysical` SET entSensorType = '$entSensorType', entSensorScale = '$entSensorScale', entSensorPrecision = '$entSensorPrecision', ";
# $sql .= " entSensorMeasuredEntity = '$entSensorMeasuredEntity'";
# $sql .= " WHERE device_id = '".$device['device_id']."' AND entPhysicalIndex = '$entPhysicalIndex'";
# } else {
# echo("!");
# $sql = "UPDATE `entPhysical` SET entSensorType = '', entSensorScale = '', entSensorPrecision = '', entSensorMeasuredEntity = ''";
# $sql .= " WHERE device_id = '".$device['device_id']."' AND entPhysicalIndex = '$entPhysicalIndex'";
# }
# mysql_query($sql);
# }
$valid[$entPhysicalIndex] = 1;
}
}