syslog search improvements and bgp updates graph toggle

git-svn-id: http://www.observium.org/svn/observer/trunk@334 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-01-07 12:37:18 +00:00
parent 2f69e529cb
commit 576f4b28da
3 changed files with 60 additions and 30 deletions

View File

@@ -19,6 +19,8 @@ RewriteRule ^interfaces/(.+)/ ?page=interfaces&type=$1
RewriteRule ^bill/([0-9]+) ?page=bills&bill=$1
RewriteRule ^device/([0-9]+)/([a-z]+)/([a-z]+)/([a-z]+)/ ?page=device&id=$1&section=$2&opta=$3&optb=$4
RewriteRule ^device/([0-9]+)/([a-z]+)/([a-z]+)/ ?page=device&id=$1&section=$2&opta=$3
RewriteRule ^device/([0-9]+)/([a-z]+)/ ?page=device&id=$1&section=$2
RewriteRule ^device/([0-9]+) ?page=device&id=$1

View File

@@ -1,5 +1,18 @@
<?php
if($_GET['opta'] == "graphs" || $_GET['opta'] == "graphs") {
$graphs = 1;
} else {
$graphs = 0;
}
echo("
<div style='float: right; text-align: right;'>
<a href='/device/" . $_GET['id'] . "/bgp/'>No Graphs</a> |
<a href='/device/" . $_GET['id'] . "/bgp/graphs/'>Graphs</a>
</div>");
echo("<div style='margin: 5px;'><table border=0 cellspacing=1 cellpadding=5 width=100%>");
echo("<tr><td colspan=6><h2>Local AS : " . $device['bgpLocalAs'] . "</h2></td></tr>");
@@ -30,20 +43,16 @@
<img src='images/16/arrow_up.png' align=absmiddle> " . $peer['bgpPeerOutUpdates'] . "</td></tr>");
$graphs=1;
if($graphs) {
$graph_type = "bgpupdates";
$daily_traffic = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$day&to=$now&width=209&height=100";
$daily_url = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$day&to=$now&width=500&height=150";
$weekly_traffic = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$week&to=$now&width=209&height=100";
$weekly_url = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$week&to=$now&width=500&height=150";
$monthly_traffic = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$month&to=$now&width=209&height=100";
$monthly_url = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$month&to=$now&width=500&height=150";
$yearly_traffic = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$year&to=$now&width=209&height=100";
$yearly_url = "graph.php?peer=" . $peer['bgpPeer_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150";

View File

@@ -1,26 +1,45 @@
<?
$query = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date ";
$query .= "FROM `syslog` WHERE `device_id` = '" . $_GET['id'] . "'";
if($search) { $query .= " AND `msg` LIKE '%" . $_POST['search'] . "%'"; }
$query .= " ORDER BY `datetime` desc LIMIT 0,500";
$data = mysql_query($query);
echo("<div align=right><form id='form1' name='form1' method='post' action='" . $_SERVER['REQUEST_URI'] . "'>
<label>
<input type='text' name='search' id='search' />
<input type='submit' name='button' id='button' value='Search' />
<div style="background-color: #eeeeee; padding: 10px;">
<form method="post" action="">
<label><strong>Search</strong>
<input type="text" name="string" id="string" value="<?php echo($_POST['string']); ?>" />
</label>
<label>
<strong>Program</strong>
<select name="program" id="program">
<option value="">All Programs</option>
<?php
$query = mysql_query("SELECT `program` FROM `syslog` WHERE device_id = '" . $_GET['id'] . "' GROUP BY `program` ORDER BY `program`");
while($data = mysql_fetch_array($query)) {
echo("<option value='".$data['program']."'");
if($data['program'] == $_POST['program']) { echo("selected"); }
echo(">".$data['program']."</option>");
}
?>
</select>
</label>
</form></div>");
echo("<table cellspacing=0 cellpadding=2 width=100%>");
<input type=submit value=Search>
while($entry = mysql_fetch_array($data)) {
include("includes/print-syslog.inc");
</form>
</div>
<?php
if($_POST['string']) {
$where = " AND S.msg LIKE '%".$_POST['string']."%'";
}
if($_POST['program']) {
$where .= " AND S.program = '".$_POST['program']."'";
}
$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog WHERE device_id = '" . $_GET['id'] . "' $where";
$sql .= " 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"); }
echo("</table>");
?>