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

Update syslog page

Browse Source 
Brings Syslog page HTML in line with Eventlog page.
This commit is contained in:
Florian Beer
2016-08-05 14:30:06 +02:00
parent a7a8c55eb5
commit adafda7773
2 changed files with 84 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
html/includes/common/syslog.inc.php
View File

@ -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">&nbsp;</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>
@ -22,6 +23,10 @@ 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"

118
html/pages/syslog.inc.php
View File

@ -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">
<thead>
<tr>
<th data-column-id="priority">&nbsp;</th>
<th data-column-id="timestamp" data-order="desc">Datetime</th>
<th data-column-id="device_id">Hostname</th>
<th data-column-id="program">Program</th>
<th data-column-id="msg">Message</th>
</tr>
</thead>
</table>
</div>
<script> <div id="{{ctx.id}}" class="{{css.header}}">
<div class="row">
var grid = $("#syslog").bootgrid({ <div class="col-sm-9 actionBar">
ajax: true, <div class="pull-left">
templates: { <form method="post" action="" class="form-inline" role="form" id="result_form">
header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+ <div class="form-group">
"<div class=\"col-sm-9 actionBar\"><span class=\"pull-left\">"+ <select name="device" id="device" class="form-control input-sm">
"<form method=\"post\" action=\"\" class=\"form-inline\" role=\"form\" id=\"result_form\">"+ <option value="">All Devices</option>
"<div class=\"form-group\">"+
"<select name=\"device\" id=\"device\" class=\"form-control input-sm\">"+
"<option value=\"\">All Devices</option>"+
<?php <?php
foreach (get_all_devices() as $hostname) { foreach (get_all_devices() as $hostname) {
$device_id = getidbyname($hostname); $device_id = getidbyname($hostname);
if (device_permitted($device_id)) { if (device_permitted($device_id)) {
echo '"<option value=\"'.$device_id.'\"'; echo '"<option value="'.$device_id.'"';
if ($device_id == $vars['device']) { if ($device_id == $vars['device']) {
echo ' selected'; echo ' selected';
} }
echo '>'.$hostname.'</option>"+'; echo '>'.$hostname.'</option>';
} }
} }
?> ?>
"</select>"+ </select>
"</div>"+ </div>
"<div class=\"form-group\">"+ <div class="form-group">
"<select name=\"program\" id=\"program\" class=\"form-control input-sm\">"+ <select name="program" id="program" class="form-control input-sm">
"<option value=\"\">All Programs</option>"+ <option value="">All Programs</option>
<?php <?php
foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) { foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
echo '"<option value=\"'.$data['program'].'\"'; echo '"<option value="'.$data['program'].'"';
if ($data['program'] == $vars['program']) { if ($data['program'] == $vars['program']) {
echo ' selected'; echo ' selected';
} }
echo '>'.$data['program'].'</option>"+'; echo '>'.$data['program'].'</option>';
} }
?> ?>
"</select>"+ </select>
"</div>"+ </div>
"<div class=\"form-group\">"+ <div class="form-group">
"<select name=\"priority\" id=\"priority\" class=\"form-control input-sm\">"+ <select name="priority" id="priority" class="form-control input-sm">
"<option value=\"\">All Priorities</option>"+ <option value="">All Priorities</option>
<?php <?php
foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) { foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) {
echo '"<option value=\"'.$data['priority'].'\"'; echo '"<option value="'.$data['priority'].'"';
if ($data['priority'] == $vars['priority']) { if ($data['priority'] == $vars['priority']) {
echo ' selected'; echo ' selected';
} }
echo '>'.$data['priority'].'</option>"+'; echo '>'.$data['priority'].'</option>';
} }
?> ?>
"</select>"+ </select>
"</div>"+ </div>
"<div class=\"form-group\">"+ <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\">"+ <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>
"<div class=\"form-group\">"+ <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\">"+ <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>"+ </div>
"<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+ <button type="submit" class="btn btn-default input-sm">Filter</button>
"</form></span></div>"+ </form>
"<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>" </div>
</div>
}, <div class="col-sm-3 actionBar">
post: function () <p class="{{css.actions}}"></p>
{ </div>
return { </div>
id: "syslog", </div>
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"
});
<script>
$(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);
?>