Put device rebooted event in the event log before other device events

git-svn-id: http://www.observium.org/svn/observer/trunk@970 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans 2010-02-28 01:44:34 +00:00
parent 08d8ace86e
commit b85435dadd

View File

@ -72,6 +72,29 @@ while ($device = mysql_fetch_array($device_query)) {
$status = "0";
}
if ($uptime)
{
if ( $uptime < $device['uptime'] ) {
notify($device,"Device rebooted: " . $device['hostname'], "Device Rebooted : " . $device['hostname'] . " " . formatUptime($uptime) . " ago.");
eventlog('Device rebooted', $device['device_id']);
}
$uptimerrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
if (!is_file($uptimerrd)) {
$woo = shell_exec($config['rrdtool'] . " create $uptimerrd \
DS:uptime:GAUGE:600:0:U \
RRA:AVERAGE:0.5:1:600 \
RRA:AVERAGE:0.5:6:700 \
RRA:AVERAGE:0.5:24:775 \
RRA:AVERAGE:0.5:288:797");
}
rrdtool_update($uptimerrd, "N:$uptime");
$update .= $seperator . "`uptime` = '$uptime'";
$seperator = ", ";
}
if ( $device['status'] != $status ) {
$update .= $seperator . "`status` = '$status'";
$seperator = ", ";
@ -168,28 +191,6 @@ while ($device = mysql_fetch_array($device_query)) {
eventlog("Hardware -> $hardware", $device['device_id']);
}
if ($uptime)
{
if ( $uptime < $device['uptime'] ) {
notify($device,"Device rebooted: " . $device['hostname'], "Device Rebooted : " . $device['hostname'] . " " . formatUptime($uptime) . " ago.");
eventlog('Device rebooted', $device['device_id']);
}
$uptimerrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
if (!is_file($uptimerrd)) {
$woo = shell_exec($config['rrdtool'] . " create $uptimerrd \
DS:uptime:GAUGE:600:0:U \
RRA:AVERAGE:0.5:1:600 \
RRA:AVERAGE:0.5:6:700 \
RRA:AVERAGE:0.5:24:775 \
RRA:AVERAGE:0.5:288:797");
}
rrdtool_update($uptimerrd, "N:$uptime");
$update .= $seperator . "`uptime` = '$uptime'";
$seperator = ", ";
}
$update .= $seperator . "`last_polled` = NOW()";
$seperator = ", ";
$polled_devices++;