nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

syslog improvements :)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@198 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-03-23 15:40:58 +00:00
parent 3ed9d4b2a4
commit 7394b0c1db
8 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-syslog.inc
+9 -10
View File
@@ -3,24 +3,21 @@
if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
# if($entry['interface']) {
# $interface = fixifname(getifbyid($entry['interface']));
# }
if(!$entry['processed']) { $entry = process_syslog($entry, 1); }
if(!$entry['deleted']) {
$entry['hostname'] = gethostbyid($entry['device_id']);
unset($icon);
# $icon = geteventicon($entry['message']);
# if($icon) {$icon = "<img src='images/16/$icon'>"; }
echo("<tr style=\"background-color: $bg\">
<td width=0></td>");
echo("<td class=syslog width=125>" . $entry['date'] . "</td>");
if($_GET['page'] == "syslog") {
echo("<td width=200><strong>".generatedevicelink($entry['device_id'], $entry['hostname'])."</strong></td>");
$entry['hostname'] = shorthost($entry['hostname'], 20);
if($_GET['page'] != "device") {
echo("<td width=160><strong>".generatedevicelink($entry)."</strong></td>");
}
@@ -31,4 +28,6 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
<td></td>
</tr>");
}
?>
html/pages/default.php
+47 -12
View File
@@ -2,7 +2,9 @@
<table border=0 cellpadding=10 cellspacing=10 width=100%>
<tr>
<td bgcolor=#e5e5e5 valign=top>
<table width=100% border=0><tr><td><div style="margin-bottom: 5px; font-size: 18px; font-weight: bold;">Devices with Alerts</div></td><td width=35 align=center><div class=tablehead>Host</div></td><td align=center width=35><div class=tablehead>Int</div></td><td align=center width=35><div class=tablehead>Srv</div></tr>
<?php
# <table width=100% border=0><tr><td><div style="margin-bottom: 5px; font-size: 18px; font-weight: bold;">Devices with Alerts</div></td><td width=35 align=center><div class=tablehead>Host</div></td><td align=center width=35><div class=tablehead>Int</div></td><td align=center width=35><div class=tablehead>Srv</div></tr>
?>
<?php
$nodes = array();
@@ -77,7 +79,9 @@ foreach($nodes as $node) {
$intlist = array();
$sql = mysql_query("SELECT `ifDescr`, `ifAlias` FROM interfaces WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `device_id` = '$node'");
$rebooted = mysql_result(mysql_query("SELECT attrib_value FROM `devices` AS D, `devices_attribs` AS A WHERE D.device_id = '$node' AND D.status = '1' AND A.device_id = D.device_id AND A.attrib_type = 'uptime' AND A.attrib_value > '0' AND A.attrib_value < '86400'"),0);
$uptime = mysql_result(mysql_query("SELECT attrib_value FROM `devices` AS D, `devices_attribs` AS A WHERE D.device_id = '$node' AND D.status = '1' AND A.device_id = D.device_id AND A.attrib_type = 'uptime'"),0);
if($uptime < "86000") { $rebooted = 1; } else { $rebooted = 0; }
while($int = mysql_fetch_row($sql)) { $intlist[] = "<b>$int[0]</b> - $int[1]"; }
foreach ($intlist as $intname) { $intpop .= "$br $intname"; $br = "<br />"; }
@@ -97,35 +101,66 @@ foreach($nodes as $node) {
$mouseover = "onmouseover=\"return overlib('<img src=\'graph.php?host=$node&from=$week&to=$now&width=400&height=120&type=cpu\'>');\"
onmouseout=\"return nd();\"";
if(hoststatus($node)) { $statimg = "<img align=absmiddle src=images/16/lightbulb.png alt='Host Up'>"; }
else { $statimg = "<img align=absmiddle src=images/16/lightbulb_off.png alt='Host Down'>";}
if(hoststatus($node)) { $statimg = "<img align=absmiddle src=images/16/lightbulb.png alt='Host Up'>"; $box_bg = "#ffffaa"; }
else { $statimg = "<img align=absmiddle src=images/16/lightbulb_off.png alt='Host Down'>"; $box_bg = "#ffaaaa"; }
if($rebooted) { $statimg = "<img align=absmiddle src=images/16/lightning.png alt='Host Rebooted'>"; }
if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; }
if(devicepermitted($node)) {
echo("<tr bgcolor=$bg>
<td><a href='?page=device&id=$node' $mouseover>$host</a></td>
<td align=center>$statimg</td>
<td align=center><a $intpop>$ints</a></td>
<td align=center><a $srvpop>$services</a></td></tr>");
list ($first, $second, $third) = explode(".", $host);
$shorthost = $first;
if(strlen($first.".".$second) < 16) { $shorthost = $first.".".$second; }
$errorboxes .= "<div style='float: left; padding: 5px; width: 124px; height: 100px; background: $box_bg; margin: 4px;'>
<center><strong>".$shorthost."</strong><br />";
if(hoststatus($node)) {$errorboxes .= " <span class=body-date-1>".formatuptime($uptime, short)."</span> <br />";
} else { $errorboxes .= " <span class=body-date-1>Unreachable</span> <br />"; }
$errorboxes .= " <img src='images/16/disconnect.png' align=absmiddle> <a $intpop><b>$ints</b></a>
<img src='images/16/cog_error.png' align=absmiddle> <a $srvpop><b>$services</b></a>
</center></div>";
# echo("<tr bgcolor=$bg>
# <td><a href='?page=device&id=$node' $mouseover>$host</a></td>
# <td align=center>$statimg</td>
# <td align=center><a $intpop>$ints</a></td>
# <td align=center><a $srvpop>$services</a></td></tr>");
#
}
unset($int, $ints, $intlist, $intpop, $srv, $srvlist, $srvname, $srvpop);
}
#echo("</table>");
#echo("
# </td>
# <td bgcolor=#e5e5e5 width=400 valign=top>
echo("
<div style='clear: both;'>$errorboxes</div> <div style='margin: 4px; clear: both;'> ");
$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog ORDER BY datetime DESC LIMIT 20";
$query = mysql_query($sql);
echo("<table cellspacing=0 cellpadding=2 width=100%>");
while($entry = mysql_fetch_array($query)) { include("includes/print-syslog.inc"); }
echo("</table>");
echo(" </td>
<td bgcolor=#e5e5e5 width=400 valign=top>
echo("</div>
</td>
<td bgcolor=#e5e5e5 width=275 valign=top>");
/// VOSTRON
/// this stuff can be customised to show whatever you want....
if($_SESSION['userlevel'] >= '5') {
html/pages/device/dev-edit.inc
+1 -1
View File
@@ -34,7 +34,7 @@ echo("<table cellpadding=0 cellspacing=0><tr><td>
<table width='200' border='0'>
<tr>
<td width='300'><div align='right'>Description</div></td>
<td colspan='3'><input name='descr' width='50'>$descr</input></td>
<td colspan='3'><input name='descr' size='32' value='$descr'></input></td>
</tr>
<tr>
<td>
html/pages/syslog.php
+1 -8
View File
@@ -2,16 +2,9 @@
<?
$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog ORDER BY datetime DESC LIMIT 1000";
$query = mysql_query($sql);
echo("<table cellspacing=0 cellpadding=2 width=100%>");
while($entry = mysql_fetch_array($query))
{
include("includes/print-syslog.inc");
}
while($entry = mysql_fetch_array($query)) { include("includes/print-syslog.inc"); }
echo("</table>");
?>