mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Update syslog page
Brings Syslog page HTML in line with Eventlog page.
This commit is contained in:
Florian Beer
@ -5,6 +5,7 @@ $common_output[] = '
|
|||||||
<table id="syslog" class="table table-hover table-condensed table-striped">
|
<table id="syslog" class="table table-hover table-condensed table-striped">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
<th data-column-id="priority"> </th>
|
||||||
<th data-column-id="timestamp" data-order="desc">Datetime</th>
|
<th data-column-id="timestamp" data-order="desc">Datetime</th>
|
||||||
<th data-column-id="device_id">Hostname</th>
|
<th data-column-id="device_id">Hostname</th>
|
||||||
<th data-column-id="program">Program</th>
|
<th data-column-id="program">Program</th>
|
||||||
@ -21,7 +22,11 @@ var syslog_grid = $("#syslog").bootgrid({
|
|||||||
{
|
{
|
||||||
return {
|
return {
|
||||||
id: "syslog",
|
id: "syslog",
|
||||||
device: "' .mres($vars['device']) .'",
|
device: "'.mres($vars['device']) .'",
|
||||||
|
program: "'.mres($vars['program']).'",
|
||||||
|
priority: "'.mres($vars['priority']).'",
|
||||||
|
to: "'.mres($vars['to']).'",
|
||||||
|
from: "'.mres($vars['from']).'",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
url: "ajax_table.php"
|
url: "ajax_table.php"
|
||||||
|
|||||||
@ -10,103 +10,82 @@ if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$pagetitle[] = 'Syslog';
|
$pagetitle[] = 'Syslog';
|
||||||
|
|
||||||
|
print_optionbar_start();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="table-responsive">
|
|
||||||
<table id="syslog" class="table table-hover table-condensed table-striped">
|
<div id="{{ctx.id}}" class="{{css.header}}">
|
||||||
<thead>
|
<div class="row">
|
||||||
<tr>
|
<div class="col-sm-9 actionBar">
|
||||||
<th data-column-id="priority"> </th>
|
<div class="pull-left">
|
||||||
<th data-column-id="timestamp" data-order="desc">Datetime</th>
|
<form method="post" action="" class="form-inline" role="form" id="result_form">
|
||||||
<th data-column-id="device_id">Hostname</th>
|
<div class="form-group">
|
||||||
<th data-column-id="program">Program</th>
|
<select name="device" id="device" class="form-control input-sm">
|
||||||
<th data-column-id="msg">Message</th>
|
<option value="">All Devices</option>
|
||||||
</tr>
|
<?php
|
||||||
</thead>
|
foreach (get_all_devices() as $hostname) {
|
||||||
</table>
|
$device_id = getidbyname($hostname);
|
||||||
|
if (device_permitted($device_id)) {
|
||||||
|
echo '"<option value="'.$device_id.'"';
|
||||||
|
if ($device_id == $vars['device']) {
|
||||||
|
echo ' selected';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo '>'.$hostname.'</option>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<select name="program" id="program" class="form-control input-sm">
|
||||||
|
<option value="">All Programs</option>
|
||||||
|
<?php
|
||||||
|
foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
|
||||||
|
echo '"<option value="'.$data['program'].'"';
|
||||||
|
if ($data['program'] == $vars['program']) {
|
||||||
|
echo ' selected';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo '>'.$data['program'].'</option>';
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<select name="priority" id="priority" class="form-control input-sm">
|
||||||
|
<option value="">All Priorities</option>
|
||||||
|
<?php
|
||||||
|
foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) {
|
||||||
|
echo '"<option value="'.$data['priority'].'"';
|
||||||
|
if ($data['priority'] == $vars['priority']) {
|
||||||
|
echo ' selected';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo '>'.$data['priority'].'</option>';
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<input name="from" type="text" class="form-control input-sm" id="dtpickerfrom" maxlength="16" value="<?php echo $vars['from']; ?>" placeholder="From" data-date-format="YYYY-MM-DD HH:mm">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<input name="to" type="text" class="form-control input-sm" id="dtpickerto" maxlength="16" value="<?php echo $vars['to']; ?>" placeholder="To" data-date-format="YYYY-MM-DD HH:mm">
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn btn-default input-sm">Filter</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3 actionBar">
|
||||||
|
<p class="{{css.actions}}"></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
var grid = $("#syslog").bootgrid({
|
|
||||||
ajax: true,
|
|
||||||
templates: {
|
|
||||||
header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
|
|
||||||
"<div class=\"col-sm-9 actionBar\"><span class=\"pull-left\">"+
|
|
||||||
"<form method=\"post\" action=\"\" class=\"form-inline\" role=\"form\" id=\"result_form\">"+
|
|
||||||
"<div class=\"form-group\">"+
|
|
||||||
"<select name=\"device\" id=\"device\" class=\"form-control input-sm\">"+
|
|
||||||
"<option value=\"\">All Devices</option>"+
|
|
||||||
<?php
|
|
||||||
foreach (get_all_devices() as $hostname) {
|
|
||||||
$device_id = getidbyname($hostname);
|
|
||||||
if (device_permitted($device_id)) {
|
|
||||||
echo '"<option value=\"'.$device_id.'\"';
|
|
||||||
if ($device_id == $vars['device']) {
|
|
||||||
echo ' selected';
|
|
||||||
}
|
|
||||||
|
|
||||||
echo '>'.$hostname.'</option>"+';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
"</select>"+
|
|
||||||
"</div>"+
|
|
||||||
"<div class=\"form-group\">"+
|
|
||||||
"<select name=\"program\" id=\"program\" class=\"form-control input-sm\">"+
|
|
||||||
"<option value=\"\">All Programs</option>"+
|
|
||||||
<?php
|
|
||||||
foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
|
|
||||||
echo '"<option value=\"'.$data['program'].'\"';
|
|
||||||
if ($data['program'] == $vars['program']) {
|
|
||||||
echo ' selected';
|
|
||||||
}
|
|
||||||
|
|
||||||
echo '>'.$data['program'].'</option>"+';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
"</select>"+
|
|
||||||
"</div>"+
|
|
||||||
"<div class=\"form-group\">"+
|
|
||||||
"<select name=\"priority\" id=\"priority\" class=\"form-control input-sm\">"+
|
|
||||||
"<option value=\"\">All Priorities</option>"+
|
|
||||||
<?php
|
|
||||||
foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) {
|
|
||||||
echo '"<option value=\"'.$data['priority'].'\"';
|
|
||||||
if ($data['priority'] == $vars['priority']) {
|
|
||||||
echo ' selected';
|
|
||||||
}
|
|
||||||
|
|
||||||
echo '>'.$data['priority'].'</option>"+';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
"</select>"+
|
|
||||||
"</div>"+
|
|
||||||
"<div class=\"form-group\">"+
|
|
||||||
"<input name=\"from\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerfrom\" maxlength=\"16\" value=\"<?php echo $vars['from']; ?>\" placeholder=\"From\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
|
|
||||||
"</div>"+
|
|
||||||
"<div class=\"form-group\">"+
|
|
||||||
"<input name=\"to\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerto\" maxlength=\"16\" value=\"<?php echo $vars['to']; ?>\" placeholder=\"To\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
|
|
||||||
"</div>"+
|
|
||||||
"<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
|
|
||||||
"</form></span></div>"+
|
|
||||||
"<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>"
|
|
||||||
|
|
||||||
},
|
|
||||||
post: function ()
|
|
||||||
{
|
|
||||||
return {
|
|
||||||
id: "syslog",
|
|
||||||
device: '<?php echo htmlspecialchars($vars['device']); ?>',
|
|
||||||
program: '<?php echo htmlspecialchars($vars['program']); ?>',
|
|
||||||
priority: '<?php echo htmlspecialchars($vars['priority']); ?>',
|
|
||||||
to: '<?php echo htmlspecialchars($vars['to']); ?>',
|
|
||||||
from: '<?php echo htmlspecialchars($vars['from']); ?>',
|
|
||||||
};
|
|
||||||
},
|
|
||||||
url: "ajax_table.php"
|
|
||||||
});
|
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
$("#dtpickerfrom").datetimepicker();
|
$("#dtpickerfrom").datetimepicker();
|
||||||
$("#dtpickerfrom").on("dp.change", function (e) {
|
$("#dtpickerfrom").on("dp.change", function (e) {
|
||||||
@ -126,3 +105,10 @@ $(function () {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
print_optionbar_end();
|
||||||
|
require_once 'includes/common/syslog.inc.php';
|
||||||
|
echo implode('',$common_output);
|
||||||
|
?>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user