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

Use raw timeticks instead of parsing the string for sysUpTime and hrSystemUptime

Browse Source
This commit is contained in:
Tony Murray
2016-02-16 23:46:31 -06:00
parent 1a905f2a1a
commit 9ccf16dd24
1 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
includes/polling/core.inc.php
View File

@@ -14,7 +14,7 @@
unset($poll_device); unset($poll_device);
$snmpdata = snmp_get_multi($device, 'sysUpTime.0 sysLocation.0 sysContact.0 sysName.0 sysDescr.0 sysObjectID.0', '-OQnUs', 'SNMPv2-MIB:HOST-RESOURCES-MIB:SNMP-FRAMEWORK-MIB'); $snmpdata = snmp_get_multi($device, 'sysUpTime.0 sysLocation.0 sysContact.0 sysName.0 sysDescr.0 sysObjectID.0', '-OQnUst', 'SNMPv2-MIB:HOST-RESOURCES-MIB:SNMP-FRAMEWORK-MIB');
$poll_device = $snmpdata[0]; $poll_device = $snmpdata[0];
$poll_device['sysName'] = strtolower($poll_device['sysName']); $poll_device['sysName'] = strtolower($poll_device['sysName']);
@@ -25,35 +25,20 @@ if (!empty($agent_data['uptime'])) {
} }
if (empty($uptime)) { if (empty($uptime)) {
$snmp_data = snmp_get_multi($device, 'snmpEngineTime.0 hrSystemUptime.0', '-OQnUs', 'HOST-RESOURCES-MIB:SNMP-FRAMEWORK-MIB'); $snmp_data = snmp_get_multi($device, 'snmpEngineTime.0 hrSystemUptime.0', '-OQnUst', 'HOST-RESOURCES-MIB:SNMP-FRAMEWORK-MIB');
$uptime_data = $snmp_data[0]; $uptime_data = $snmp_data[0];
$snmp_uptime = (integer) $uptime_data['snmpEngineTime']; $snmp_uptime = (integer) $uptime_data['snmpEngineTime'];
$hrSystemUptime = $uptime_data['hrSystemUptime']; $hrSystemUptime = $uptime_data['hrSystemUptime'];
if (!empty($hrSystemUptime) && !strpos($hrSystemUptime, 'No') && ($device['os'] != 'windows')) { if (!empty($hrSystemUptime) && !strpos($hrSystemUptime, 'No') && ($device['os'] != 'windows')) {
echo 'Using hrSystemUptime ('.$hrSystemUptime.")\n";
$agent_uptime = $uptime;
// Move uptime into agent_uptime // Move uptime into agent_uptime
// HOST-RESOURCES-MIB::hrSystemUptime.0 = Timeticks: (63050465) 7 days, 7:08:24.65 $agent_uptime = $uptime;
$hrSystemUptime = str_replace('(', '', $hrSystemUptime);
$hrSystemUptime = str_replace(')', '', $hrSystemUptime); $uptime = floor($hrSystemUptime / 100);
list($days,$hours, $mins, $secs) = explode(':', $hrSystemUptime); echo 'Using hrSystemUptime ('.$uptime."s)\n";
list($secs, $microsecs) = explode('.', $secs);
$hours = ($hours + ($days * 24));
$mins = ($mins + ($hours * 60));
$secs = ($secs + ($mins * 60));
$uptime = $secs;
} }
else { else {
echo 'Using SNMP Agent Uptime ('.$poll_device['sysUpTime'].")\n"; $uptime = floor($poll_device['sysUpTime'] / 100);
// SNMPv2-MIB::sysUpTime.0 = Timeticks: (2542831) 7:03:48.31 echo 'Using SNMP Agent Uptime ('.$uptime."s)\n";
$poll_device['sysUpTime'] = str_replace('(', '', $poll_device['sysUpTime']);
$poll_device['sysUpTime'] = str_replace(')', '', $poll_device['sysUpTime']);
list($days, $hours, $mins, $secs) = explode(':', $poll_device['sysUpTime']);
list($secs, $microsecs) = explode('.', $secs);
$hours = ($hours + ($days * 24));
$mins = ($mins + ($hours * 60));
$secs = ($secs + ($mins * 60));
$uptime = $secs;
}//end if }//end if
}//end if }//end if