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

sid3windr fixes!

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@587 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-01-03 09:45:19 +00:00
parent 0542c42de4
commit 5877e94093
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
includes/functions.php
View File

@@ -684,7 +684,7 @@ function snmp2ipv6($ipv6_snmp)
function ipv62snmp($ipv6)
{
$ipv6_ex = explode(':',Net_IPv6::uncompress($ipv6));
for ($i = 0;$i < 8;$i++) { $ipv6_ex[$i] = zeropad_lineno($ipv6_ex[$i]); }
for ($i = 0;$i < 8;$i++) { $ipv6_ex[$i] = zeropad_lineno($ipv6_ex[$i],4); }
$ipv6_ip = implode('',$ipv6_ex);
for ($i = 0;$i < 16;$i+=2) $ipv6_split[] = hexdec(substr($ipv6_ip,$i,2));
return implode('.',$ipv6_split);
@@ -724,5 +724,26 @@ function discover_process_ipv6($ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_orig
}
}
function duration($seconds, $max_periods = 6)
{
$periods = array("year" => 31536000, "month" => 2419200, "week" => 604800, "day" => 86400, "hour" => 3600, "minute" => 60, "second" => 1);
$i = 1;
foreach ( $periods as $period => $period_seconds )
{
$period_duration = floor($seconds / $period_seconds);
$seconds = $seconds % $period_seconds;
if ( $period_duration == 0 )
{
continue;
}
$duration[] = "{$period_duration} {$period}" . ($period_duration > 1 ? 's' : '');
$i++;
if ( $i > $max_periods )
{
break;
}
}
return implode(' ', $duration);
}
?>

2
includes/polling/hr-mib_processor.inc.php
View File

@@ -30,7 +30,7 @@ while ($hrDevice = mysql_fetch_array($query)) {
RRA:AVERAGE:0.5:12:2400");
}
echo($this_hrDevice['hrProcessorLoad'] . "% ");
if ($debug) echo($this_hrDevice['hrProcessorLoad'] . "% ");
rrdtool_update ($procrrd, "N:".$this_hrDevice['hrProcessorLoad']);

3
poll-device.php
View File

@@ -169,7 +169,8 @@ while ($device = mysql_fetch_array($device_query)) {
if( $uptime < $device['uptime'] ) {
if($device['sysContact']) { $email = $device['sysContact']; } else { $email = $config['email_default']; }
mail($email, "Device Rebooted: " . $device['hostname'], "Device Rebooted :" . $device['hostname'] . " at " . date('l dS F Y h:i:s A'), $config['email_headers']);
mail($email, "Device Rebooted: " . $device['hostname'], "Device Rebooted : " . $device['hostname'] . " " . duration($uptime) . " ago.", $config['email_headers']);
mysql_query("INSERT INTO eventlog (`host`, `interface`, `datetime`, `message`) VALUES ('" . $device['device_id'] . "', '', NOW(), 'Device rebooted')");
}
$uptimerrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";