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 service checker and added vlan display to customer list

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@124 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2007-12-03 16:56:58 +00:00
parent 47b66af119
commit b8f38d6d24
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
check-services.php
View File

@@ -18,6 +18,7 @@ while ($service = mysql_fetch_array($query)) {
$status = "2"; $status = "2";
$check = "Error : Script not found ($checker_script)"; $check = "Error : Script not found ($checker_script)";
} }
<<<<<<< .mine
if($service_status != $status) { if($service_status != $status) {
$updated = ", `service_changed` = '" . time() . "' "; $updated = ", `service_changed` = '" . time() . "' ";
if($service['sysContact']) { $email = $service['sysContact']; } else { $email = $config['email_default']; } if($service['sysContact']) { $email = $service['sysContact']; } else { $email = $config['email_default']; }
@@ -31,6 +32,23 @@ while ($service = mysql_fetch_array($query)) {
mail($email, "Service Down: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']); mail($email, "Service Down: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
} }
} else { unset($updated); }
mysql_query("UPDATE `services` SET `service_status` = '$status', `service_message` = '$check', `service_checked` = '" . time() . "' $updated WHERE `service_id` = '$service[service_id]'");
=======
if($service_status != $status) {
$updated = ", `service_changed` = '" . time() . "' ";
if($service['sysContact']) { $email = $service['sysContact']; } else { $email = $config['email_default']; }
if($status == "1") {
$msg = "Service Up: " . $service['service_type'] . " on " . $service['hostname'];
$msg .= " at " . date('l dS F Y h:i:s A');
mail($email, "Service Up: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
} elseif ($status == "0") {
$msg = "Service Down: " . $service['service_type'] . " on " . $service['hostname'];
$msg .= " at " . date('l dS F Y h:i:s A');
mail($email, "Service Down: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
}
>>>>>>> .r121
} else { unset($updated); } } else { unset($updated); }
$update_sql = "UPDATE `services` SET `service_status` = '$status', `service_message` = '" . addslashes($check) . "', `service_checked` = '" . time() . "' $updated WHERE `service_id` = '" . $service['service_id']. "'"; $update_sql = "UPDATE `services` SET `service_status` = '$status', `service_message` = '" . addslashes($check) . "', `service_checked` = '" . time() . "' $updated WHERE `service_id` = '" . $service['service_id']. "'";
mysql_query($update_sql); mysql_query($update_sql);

6
html/includes/print-interface.inc
View File

@@ -46,8 +46,10 @@
$in_perc = @round($interface['in_rate']/$interface['ifSpeed']*100); $in_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
$out_perc = @round($interface['in_rate']/$interface['ifSpeed']*100); $out_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
echo("<img src='/images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>" . formatRates($interface['in_rate']) . "</span><br />"); echo("<img src='/images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>" .
echo("<img align=absmiddle src='/images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>" . formatRates($interface['out_rate']) . "</span>"); formatRates($interface['in_rate']) . "</span><br />");
echo("<img align=absmiddle src='/images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>" .
formatRates($interface['out_rate']) . "</span>");
} }
echo("</td><td width=70>"); echo("</td><td width=70>");

9
html/pages/customers.php
View File

@@ -36,12 +36,21 @@
} }
$previfalias = $device['ifAlias']; $previfalias = $device['ifAlias'];
if($device['os'] == "IOS") {
if($interface['ifTrunk']) { $vlan = "<span class=box-desc><span class=red>" . $interface['ifTrunk'] . "</span></span>";
} elseif ($interface['ifVlan']) { $vlan = "<span class=box-desc><span class=blue>VLAN " . $interface['ifVlan'] . "</span></span>";
} else { $vlan = ""; }
}
echo(" echo("
<tr bgcolor='$bg'> <tr bgcolor='$bg'>
<td width='7'></td> <td width='7'></td>
<td width='250'><span style='font-weight: bold;' class=interface>$useifalias</span></td> <td width='250'><span style='font-weight: bold;' class=interface>$useifalias</span></td>
<td width='200'>" . generatedevicelink($device) . "</td> <td width='200'>" . generatedevicelink($device) . "</td>
<td width='100'>" . generateiflink($interface, makeshortif($interface['ifDescr'])) . "</td> <td width='100'>" . generateiflink($interface, makeshortif($interface['ifDescr'])) . "</td>
<td width='100'>$vlan</td>
<td>$notes</td> <td>$notes</td>
</tr> </tr>
"); ");