mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
webui: Individual devices now use bootgrid syslog (#4584)
This commit is contained in:
committed by
Tony Murray
parent
edbb6ae0e3
commit
faeb5e4984
@ -43,6 +43,9 @@ if (isset($config['graylog']['server']) && isset($config['graylog']['port'])) {
|
||||
|
||||
switch ($vars['section']) {
|
||||
case 'syslog':
|
||||
print_optionbar_end();
|
||||
include 'pages/syslog.inc.php';
|
||||
break;
|
||||
case 'eventlog':
|
||||
case 'graylog':
|
||||
include 'pages/device/logs/'.$vars['section'].'.inc.php';
|
||||
|
@ -1,61 +0,0 @@
|
||||
|
||||
<hr />
|
||||
|
||||
<form method="post" action="">
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<input class="form-control" type="text" name="string" palaceholder="Search" id="string" value="<?php echo $_POST['string']; ?>">
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<select name="program" class="form-control" id="program">
|
||||
<option value="">All Programs</option>
|
||||
<?php
|
||||
$datas = dbFetchRows('SELECT `program` FROM `syslog` WHERE device_id = ? GROUP BY `program` ORDER BY `program`', array($device['device_id']));
|
||||
foreach ($datas as $data) {
|
||||
echo "<option value='".$data['program']."'";
|
||||
if ($data['program'] == $_POST['program']) {
|
||||
echo 'selected';
|
||||
}
|
||||
|
||||
echo '>'.$data['program'].'</option>';
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input class="btn btn-default" type="submit" value="Search">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
print_optionbar_end();
|
||||
|
||||
$param = array($device['device_id']);
|
||||
|
||||
if ($_POST['string']) {
|
||||
$where = ' AND msg LIKE ?';
|
||||
$param[] = '%'.$_POST['string'].'%';
|
||||
}
|
||||
|
||||
if ($_POST['program']) {
|
||||
$where .= ' AND program = ?';
|
||||
$param[] = $_POST['program'];
|
||||
}
|
||||
|
||||
$sql = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog WHERE device_id = ? $where";
|
||||
$sql .= ' ORDER BY timestamp DESC LIMIT 1000';
|
||||
echo ' <div class="panel panel-default panel-condensed">
|
||||
<div class="panel-heading">
|
||||
<strong>Syslog entries</strong>
|
||||
</div>
|
||||
<table class="table table-hover table-condensed table-striped">';
|
||||
foreach (dbFetchRows($sql, $param) as $entry) {
|
||||
unset($syslog_output);
|
||||
include 'includes/print-syslog.inc.php';
|
||||
echo $syslog_output;
|
||||
}
|
||||
|
||||
echo ' </table>
|
||||
</div>';
|
||||
$pagetitle[] = 'Syslog';
|
@ -22,22 +22,29 @@ print_optionbar_start();
|
||||
<div class="pull-left">
|
||||
<form method="post" action="" class="form-inline" role="form" id="result_form">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
if (!is_numeric($vars['device'])) {
|
||||
?>
|
||||
<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>';
|
||||
<?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>
|
||||
<?php
|
||||
} else {
|
||||
echo '<input type="hidden" name="device" id="device" value="' . $vars['device'] . '">';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<select name="program" id="program" class="form-control input-sm">
|
||||
|
Reference in New Issue
Block a user