- Devices with Alerts | Host | Int | Srv |
+Devices with Alerts | Host | Int | Srv |
+?>
'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[] = "$int[0] - $int[1]"; }
foreach ($intlist as $intname) { $intpop .= "$br $intname"; $br = "
"; }
@@ -97,35 +101,66 @@ foreach($nodes as $node) {
$mouseover = "onmouseover=\"return overlib(' ');\"
onmouseout=\"return nd();\"";
- if(hoststatus($node)) { $statimg = " "; }
- else { $statimg = " ";}
+ if(hoststatus($node)) { $statimg = ""; $box_bg = "#ffffaa"; }
+ else { $statimg = ""; $box_bg = "#ffaaaa"; }
+
if($rebooted) { $statimg = " "; }
if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; }
if(devicepermitted($node)) {
- echo("
- | $host |
- $statimg |
- $ints |
- $services | ");
+ list ($first, $second, $third) = explode(".", $host);
+ $shorthost = $first;
+ if(strlen($first.".".$second) < 16) { $shorthost = $first.".".$second; }
+
+
+ $errorboxes .= "
+ ".$shorthost."
";
+
+ if(hoststatus($node)) {$errorboxes .= " ".formatuptime($uptime, short)."
";
+ } else { $errorboxes .= " Unreachable
"; }
+
+ $errorboxes .= "  $ints
+  $services
+
+# | $host |
+# $statimg |
+# $ints |
+# $services | ");
+#
}
unset($int, $ints, $intlist, $intpop, $srv, $srvlist, $srvname, $srvpop);
}
+#echo("
");
+
+#echo("
+# |
+#
+
+echo("
+
+ $errorboxes ");
+
+$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog ORDER BY datetime DESC LIMIT 20";
+$query = mysql_query($sql);
+echo(" ");
+while($entry = mysql_fetch_array($query)) { include("includes/print-syslog.inc"); }
echo(" ");
-echo(" |
-
+echo("
|
");
-/// VOSTRON
+/// this stuff can be customised to show whatever you want....
if($_SESSION['userlevel'] >= '5') {
diff --git a/html/pages/device/dev-edit.inc b/html/pages/device/dev-edit.inc
index c3c6e0535..7e73c1379 100644
--- a/html/pages/device/dev-edit.inc
+++ b/html/pages/device/dev-edit.inc
@@ -34,7 +34,7 @@ echo("|
");
?>
diff --git a/includes/functions.php b/includes/functions.php
index 75d368f0f..ab8274dc7 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -11,6 +11,31 @@ include("print-functions.php");
include("billing-functions.php");
include("cisco-entities.php");
+include("syslog.php");
+
+
+function shorthost($hostname, $len=16) {
+
+ list ($first, $second, $third, $fourth, $fifth) = explode(".", $hostname);
+
+ $shorthost = $first;
+ if(strlen($first.".".$second) < $len && $second) {
+ $shorthost = $first.".".$second;
+ if(strlen($shorthost.".".$third) < $len && $third) {
+ $shorthost = $shorthost.".".$third;
+ if(strlen($shorthost.".".$fourth) < $len && $fourth) {
+ $shorthost = $shorthost.".".$fourth;
+ if(strlen($shorthost.".".$fifth) < $len && $fifth) {
+ $shorthost = $shorthost.".".$fifth;
+ }
+ }
+ }
+ }
+
+ return ($shorthost);
+
+}
+
function rrdtool_update($rrdfile, $rrdupdate) {
global $rrdtool;
return `$rrdtool update $rrdfile $rrdupdate`;
@@ -373,7 +398,9 @@ function cidr2netmask() {
<< (32-$netmask)));
}
-function formatUptime($diff) {
+function formatUptime($diff, $format="long") {
+ $yearsDiff = floor($diff/31536000);
+ $diff -= $yearsDiff*31536000;
$daysDiff = floor($diff/86400);
$diff -= $daysDiff*86400;
$hrsDiff = floor($diff/60/60);
@@ -381,10 +408,19 @@ function formatUptime($diff) {
$minsDiff = floor($diff/60);
$diff -= $minsDiff*60;
$secsDiff = $diff;
- if($daysDiff > '0'){ $uptime .= "$daysDiff days, "; }
- if($hrsDiff > '0'){ $uptime .= $hrsDiff . "h "; }
- if($minsDiff > '0'){ $uptime .= $minsDiff . "m "; }
- if($secsDiff > '0'){ $uptime .= $secsDiff . "s "; }
+ if($format == "short") {
+ if($yearsDiff > '0'){ $uptime .= $yearsDiff . "y "; }
+ if($daysDiff > '0'){ $uptime .= $daysDiff . "d "; }
+ if($hrsDiff > '0'){ $uptime .= $hrsDiff . "h "; }
+ if($minsDiff > '0'){ $uptime .= $minsDiff . "m "; }
+ if($secsDiff > '0'){ $uptime .= $secsDiff . "s "; }
+ } else {
+ if($yearsDiff > '0'){ $uptime .= $yearsDiff . " years, "; }
+ if($daysDiff > '0'){ $uptime .= $daysDiff . " days, "; }
+ if($hrsDiff > '0'){ $uptime .= $hrsDiff . "h "; }
+ if($minsDiff > '0'){ $uptime .= $minsDiff . "m "; }
+ if($secsDiff > '0'){ $uptime .= $secsDiff . "s "; }
+ }
return "$uptime";
}
diff --git a/process-syslog.php b/process-syslog.php
index 4cb7a9964..957bab883 100755
--- a/process-syslog.php
+++ b/process-syslog.php
@@ -4,67 +4,21 @@
include("config.php");
include("includes/functions.php");
-if(!$config['enable_syslog']) { echo("Syslog support disabled.\n"); exit(); }
-
-$add = 0;
-$discard = 0;
-$total = 0;
-
mysql_query("DELETE FROM `syslog` WHERE `msg` LIKE '%last message repeated%'");
mysql_query("DELETE FROM `syslog` WHERE `msg` LIKE '%Connection from UDP: [89.21.224.44]:%'");
mysql_query("DELETE FROM `syslog` WHERE `msg` LIKE '%Connection from UDP: [89.21.224.35]:%'");
+
+if(!$config['enable_syslog']) {
+ echo("Syslog support disabled.\n");
+ exit();
+}
+
$q = mysql_query("SELECT * FROM `syslog` where `processed` = '0'");
while($entry = mysql_fetch_array($q)){
- unset($device_id);
- unset($maybehost);
- unset($perhapshost);
-
- $device_id_host = @mysql_result(mysql_query("SELECT device_id FROM devices WHERE `hostname` = '".$entry['host']."'"),0);
-
- if($device_id_host) {
- $device_id = $device_id_host;
- } else {
- $device_id_ip = @mysql_result(mysql_query("SELECT D.device_id as device_id FROM ipaddr AS A, interfaces AS I, devices AS D WHERE A.addr = '" . $entry['host']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id"),0);
- if($device_id_ip) {
- $device_id = $device_id_ip;
- }
- }
-
- if($device_id) {
-
- if(mysql_result(mysql_query("SELECT `os` FROM `devices` WHERE `device_id` = '$device_id'"),0) == "IOS") {
- list(,$entry[msg]) = split(": %", $entry['msg']);
- $entry['msg'] = "%" . $entry['msg'];
- $entry['msg'] = preg_replace("/^%(.+?):\ /", "\\1||", $entry['msg']);
- list($entry['program'], $entry['msg']) = explode("||", $entry['msg']);
- } else {
- $program = preg_quote($entry['program'],'/');
- $entry['msg'] = preg_replace("/^$program:\ /", "", $entry['msg']);
- if(preg_match("/^[a-zA-Z\/]+\[[0-9]+\]:/", $entry['msg'])) {
- $entry['msg'] = preg_replace("/^(.+?)\[[0-9]+\]:\ /", "\\1||", $entry['msg']);
- list($entry['program'], $entry['msg']) = explode("||", $entry['msg']);
- echo("fix! -> " . $entry['program'] . " -> " . $entry['msg'] . "\n");
- }
- }
-
- $x = "UPDATE `syslog` set `device_id` = '$device_id', `program` = '".$entry['program']."', `msg` = '" . mysql_real_escape_string($entry['msg']) . "', processed = '1' WHERE `seq` = '" . $entry['seq'] . "'";
-# echo("$x \n");
- mysql_query($x);
- unset ($fix);
- $add++;
- } else {
- echo("Failed entry from '" . $entry['host'] . "'");
- $x = "DELETE FROM `syslog` where `seq` = '" . $entry['seq'] . "'";
- mysql_query($x);
- $discard++;
- }
-
- $total++;
+ process_syslog($entry, 1);
}
-#echo("$total records processed: $add added to database, $discard discarded");
-
?>
|
|