tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 03:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Added new images

Browse Source 
- enhanced filter dialog
- minor changes
This commit is contained in:
Andre Lorbach 2008-03-14 14:18:30 +01:00
parent 4693ce9323
commit 06d024ae6b
12 changed files with 207 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/icons/navigate_down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 718 B

BIN
images/icons/navigate_down2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 976 B

BIN
images/icons/navigate_minus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 485 B

BIN
images/icons/navigate_plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 709 B

34
include/constants_general.php
View File

@ -46,8 +46,36 @@ define('SOURCE_MYSQLDB', '2');
// ---
define('UID_UNKNOWN', -1);
// ---
// --- Syslog specific defines!
define('SYSLOG_KERN', 0);
define('SYSLOG_USER', 1);
define('SYSLOG_MAIL', 2);
define('SYSLOG_DAEMON', 3);
define('SYSLOG_AUTH', 4);
define('SYSLOG_SYSLOG', 5);
define('SYSLOG_LPR', 6);
define('SYSLOG_NEWS', 7);
define('SYSLOG_UUCP', 8);
define('SYSLOG_CRON', 9);
define('SYSLOG_LOCAL0', 16);
define('SYSLOG_LOCAL1', 17);
define('SYSLOG_LOCAL2', 18);
define('SYSLOG_LOCAL3', 19);
define('SYSLOG_LOCAL4', 20);
define('SYSLOG_LOCAL5', 21);
define('SYSLOG_LOCAL6', 22);
define('SYSLOG_LOCAL7', 23);
define('SYSLOG_EMERG', 0);
define('SYSLOG_ALERT', 1);
define('SYSLOG_CRIT', 2);
define('SYSLOG_ERR', 3);
define('SYSLOG_WARNING', 4);
define('SYSLOG_NOTICE', 5);
define('SYSLOG_INFO', 6);
define('SYSLOG_DEBUG', 7);
// ---
?>

1
include/constants_logstream.php
View File

@ -62,5 +62,4 @@ define('IUT_SMTPLISTENER', '24');
define('IUT_AliveMonECHO', '1999998');
define('IUT_MIAP_Receiver', '1999999');
// ---
?>

81
include/functions_filters.php
View File

@ -34,15 +34,15 @@ function InitFilterHelpers()
$filters['filter_datemode'] = DATEMODE_ALL;
// Init TimeFilter Helper Array
// $content['datemodes'][0]['ID'] = DATEMODE_ALL;
// $content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_ALL'];
// if ( $filters['filter_datemode'] == DATEMODE_ALL ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; }
$content['datemodes'][0]['ID'] = DATEMODE_RANGE;
$content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_RANGE'];
if ( $filters['filter_datemode'] == DATEMODE_RANGE ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; }
$content['datemodes'][1]['ID'] = DATEMODE_LASTX;
$content['datemodes'][1]['DisplayName'] = $content['LN_DATEMODE_LASTX'];
if ( $filters['filter_datemode'] == DATEMODE_LASTX ) { $content['datemodes'][1]['selected'] = "selected"; } else { $content['datemodes'][1]['selected'] = ""; }
$content['datemodes'][0]['ID'] = DATEMODE_ALL;
$content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_ALL'];
if ( $filters['filter_datemode'] == DATEMODE_ALL ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; }
$content['datemodes'][1]['ID'] = DATEMODE_RANGE;
$content['datemodes'][1]['DisplayName'] = $content['LN_DATEMODE_RANGE'];
if ( $filters['filter_datemode'] == DATEMODE_RANGE ) { $content['datemodes'][1]['selected'] = "selected"; } else { $content['datemodes'][1]['selected'] = ""; }
$content['datemodes'][2]['ID'] = DATEMODE_LASTX;
$content['datemodes'][2]['DisplayName'] = $content['LN_DATEMODE_LASTX'];
if ( $filters['filter_datemode'] == DATEMODE_LASTX ) { $content['datemodes'][2]['selected'] = "selected"; } else { $content['datemodes'][2]['selected'] = ""; }
// Init Date Range Parameters
$currentTime = time();
@ -128,6 +128,69 @@ function InitFilterHelpers()
$content['filter_daterange_last_x_list'][4]['DisplayName'] = $content['LN_DATE_LASTX_31DAYS'];
if ( $filters['filter_lastx_default'] == DATE_LASTX_31DAYS ) { $content['filter_daterange_last_x_list'][4]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][4]['selected'] = ""; }
// ---
// Init Default Syslog Facility from SESSION!
if ( isset($_SESSION['filter_facility']) )
$filters['filter_facility'] = intval($_SESSION['filter_facility']);
else
$filters['filter_facility'] = array ( SYSLOG_KERN, SYSLOG_USER, SYSLOG_MAIL, SYSLOG_DAEMON, SYSLOG_AUTH, SYSLOG_SYSLOG, SYSLOG_LPR, SYSLOG_NEWS, SYSLOG_UUCP, SYSLOG_CRON, SYSLOG_LOCAL0, SYSLOG_LOCAL1, SYSLOG_LOCAL2, SYSLOG_LOCAL3, SYSLOG_LOCAL4, SYSLOG_LOCAL5, SYSLOG_LOCAL6, SYSLOG_LOCAL7 );
// $filters['filter_facility'] = SYSLOG_LOCAL0;
// Init Facility LIST
$content['filter_facility_list'][] = array( "ID" => SYSLOG_KERN, "DisplayName" => "SYSLOG_KERN", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_USER, "DisplayName" => "SYSLOG_USER", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_MAIL, "DisplayName" => "SYSLOG_MAIL", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_DAEMON, "DisplayName" => "SYSLOG_DAEMON", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_AUTH, "DisplayName" => "SYSLOG_AUTH", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_SYSLOG, "DisplayName" => "SYSLOG_SYSLOG", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LPR, "DisplayName" => "SYSLOG_LPR", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_NEWS, "DisplayName" => "SYSLOG_NEWS", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_UUCP, "DisplayName" => "SYSLOG_UUCP", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_CRON, "DisplayName" => "SYSLOG_CRON", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL0, "DisplayName" => "SYSLOG_LOCAL0", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL1, "DisplayName" => "SYSLOG_LOCAL1", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL2, "DisplayName" => "SYSLOG_LOCAL2", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL3, "DisplayName" => "SYSLOG_LOCAL3", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL4, "DisplayName" => "SYSLOG_LOCAL4", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL5, "DisplayName" => "SYSLOG_LOCAL5", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL6, "DisplayName" => "SYSLOG_LOCAL6", "selected" => "" );
$content['filter_facility_list'][] = array( "ID" => SYSLOG_LOCAL7, "DisplayName" => "SYSLOG_LOCAL7", "selected" => "" );
$iCount = count($content['filter_facility_list']);
for ( $i = 0; $i < $iCount; $i++ )
{
// echo $content['filter_facility_list'][$i]["ID"] . "-" . $filters['filter_facility'] . "<br>";
if ( in_array($content['filter_facility_list'][$i]["ID"], $filters['filter_facility']) )
$content['filter_facility_list'][$i]["selected"] = "selected";
}
// Init Default Syslog Severity from SESSION!
if ( isset($_SESSION['filter_severity']) )
$filters['filter_severity'] = intval($_SESSION['filter_severity']);
else
$filters['filter_severity'] = array ( SYSLOG_EMERG, SYSLOG_ALERT, SYSLOG_CRIT, SYSLOG_ERR, SYSLOG_WARNING, SYSLOG_NOTICE, SYSLOG_INFO, SYSLOG_DEBUG );
// $filters['filter_severity'] = SYSLOG_NOTICE;
// Init Severity LIST
$content['filter_severity_list'][] = array( "ID" => SYSLOG_EMERG, "DisplayName" => "SYSLOG_EMERG", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_ALERT, "DisplayName" => "SYSLOG_ALERT", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_CRIT, "DisplayName" => "SYSLOG_CRIT", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_ERR, "DisplayName" => "SYSLOG_ERR", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_WARNING, "DisplayName" => "SYSLOG_WARNING", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_NOTICE, "DisplayName" => "SYSLOG_NOTICE", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_INFO, "DisplayName" => "SYSLOG_INFO", "selected" => "" );
$content['filter_severity_list'][] = array( "ID" => SYSLOG_DEBUG, "DisplayName" => "SYSLOG_DEBUG", "selected" => "" );
$iCount = count($content['filter_severity_list']);
for ( $i = 0; $i < $iCount; $i++ )
{
if ( in_array( $content['filter_severity_list'][$i]["ID"], $filters['filter_severity']) )
$content['filter_severity_list'][$i]["selected"] = "selected";
}
}
function FillDateRangeArray($sourcearray, $szArrayListName, $szFilterName) // $content['years'], "filter_daterange_from_year_list", "filter_daterange_from_year")

3
index.php
View File

@ -64,7 +64,6 @@ if ( isset($content['Sources'][$currentSourceID]) && $content['Sources'][$curren
require_once($gl_root_path . 'include/constants_errors.php');
require_once($gl_root_path . 'include/constants_logstream.php');
// Obtain Config Object
$stream_config = $content['Sources'][$currentSourceID]['ObjRef'];
@ -102,8 +101,6 @@ if ( isset($content['Sources'][$currentSourceID]) && $content['Sources'][$curren
$content['main_pagerenabled'] = "true";
}
// Close file!
$stream->Close();
}

7
js/common.js
View File

@ -99,7 +99,12 @@ function hidevisibility(ElementNameToggle, ElementNameButton)
function toggleDatefiltervisibility(FormName)
{
var myform = document.getElementById(FormName);
if (myform.elements['filter_datemode'].value == DATEMODE_RANGE)
if (myform.elements['filter_datemode'].value == DATEMODE_ALL)
{
hidevisibility('HiddenDateFromOptions');
hidevisibility('HiddenDateLastXOptions');
}
else if (myform.elements['filter_datemode'].value == DATEMODE_RANGE)
{
togglevisibility('HiddenDateFromOptions');
hidevisibility('HiddenDateLastXOptions');

12
lang/en/main.php
View File

@ -24,6 +24,12 @@ $content['LN_GRID_INFOUNIT'] = "InfoUnit";
$content['LN_GRID_HOST'] = "Source";
$content['LN_GRID_MSG'] = "Message";
$content['LN_SEARCH_FILTER'] = "Search (filter):";
$content['LN_SEARCH_ADVANCED'] = "Advanced Search";
$content['LN_SEARCH_FEELSAD'] = "I'm feeling sad ...";
$content['LN_SEARCH'] = "Search";
$content['LN_SEARCH_RESET'] = "Reset search";
// Filter Options
$content['LN_FILTER_DATE'] = "Datetime Range";
$content['LN_FILTER_DATEMODE'] = "Select mode";
@ -39,5 +45,11 @@ $content['LN_DATE_LASTX_12HOURS'] = "Last 12 hours";
$content['LN_DATE_LASTX_24HOURS'] = "Last 24 hours";
$content['LN_DATE_LASTX_7DAYS'] = "Last 7 days";
$content['LN_DATE_LASTX_31DAYS'] = "Last 31 days";
$content['LN_FILTER_FACILITY'] = "Syslog Facility";
$content['LN_FILTER_SEVERITY'] = "Syslog Severity";
$content['LN_FILTER_OTHERS'] = "Other Filters";
$content['LN_FILTER_MESSAGE'] = "Syslog Message";
$content['LN_FILTER_SYSLOGTAG'] = "Syslogtag";
$content['LN_FILTER_SOURCE'] = "Source (Hostname)";
?>

99
templates/index.html
View File

@ -4,17 +4,19 @@
<form action="" method="post" name="search">
<tr>
<!-- <td class="topmenu2 ExpansionPlus" nowrap align="center" width="105" id="advancedsearch"><a class="topmenu1_link" href="#" OnClick="togglevisibility('HiddenOptions', 'advancedsearch');">Advanced Search</a></td>-->
<td nowrap align="center" nowrap>
<B>&nbsp;Search (filter): </B>
<td nowrap align="center" nowrap valign="middle">
<B>&nbsp;{LN_SEARCH_FILTER}</B>
<!-- <img src="{BASEPATH}images/icons/navigate_down.png" class="SelectSavedFilter" align="middle" width="16" height="16">-->
<input maxlength="2048" name="filter" size="55" title="Search" value="" class="SearchFormControl">
<br>
<input name="search" type="submit" value="Search" class="SearchFormControl">
<input type="reset" value="Reset search" class="SearchFormControl">
<!-- <input type="button" value="Advanced Search" class="SearchFormControl" OnClick="togglevisibility('HiddenOptions', null);">-->
<input name="search" type="submit" value="{LN_SEARCH}" class="SearchFormControl">
<input name="search" type="submit" value="{LN_SEARCH_FEELSAD}" class="SearchFormControl">
<input type="reset" value="{LN_SEARCH_RESET}" class="SearchFormControl">
<br>
</td>
<td nowrap align="left" nowrap valign="top">
<a href="#" OnClick="togglevisibility('HiddenOptions', null);">Advanced Search</a>
<a href="javascript:void(0);" OnClick="togglevisibility('HiddenOptions', null);">{LN_SEARCH_ADVANCED}</a>
<br>
<i>(sample: faciliy:local0 severity:warn)</i>
</td>
@ -23,18 +25,19 @@
</table>
<div id="HiddenOptions" class="HiddenContent">
<form action="" method="post" name="filterdateform">
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td width="50%" valign="top" class="with_border">
<td width="50%" valign="top" class="table_with_border">
<form action="" method="post" name="filterdateform">
<table border="0" cellpadding="1" cellspacing="1" width="100%" align="center">
<tr>
<td colspan="2" align="center" valign="top" class="title">
<strong>{LN_FILTER_DATE}</strong></td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="250" nowrap><b>{LN_FILTER_DATEMODE}</b></td>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_DATEMODE}</b></td>
<td align="right" class="line0" width="100%">
<select name="filter_datemode" size="1" OnChange="toggleDatefiltervisibility('filterdateform');">
<!-- BEGIN datemodes -->
@ -48,7 +51,7 @@
<div id="HiddenDateFromOptions" class="HiddenContent">
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="100%" align="center">
<tr>
<td align="left" class="cellmenu2" width="250" nowrap><b>{LN_FILTER_DATEFROM}</b></td>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_DATEFROM}</b></td>
<td align="right" class="line1" width="100%">
<select name="filter_daterange_from_year" size="1">
<!-- BEGIN filter_daterange_from_year_list -->
@ -70,7 +73,7 @@
</td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="250" nowrap><b>{LN_FILTER_DATETO}</b></td>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_DATETO}</b></td>
<td align="right" class="line0" width="100%">
<select name="filter_daterange_to_year" size="1">
<!-- BEGIN filter_daterange_to_year_list -->
@ -109,6 +112,7 @@
</table>
</div>
<!--
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="100%" align="center">
<tr>
<td align="center" colspan="2">
@ -116,21 +120,86 @@
</td>
</tr>
</table>
</form>
-->
</td>
<td width="10" valign="top" nowrap>&nbsp;</td>
<td width="50%" valign="top">
<td width="50%" valign="top" class="table_with_border">
<table border="0" cellpadding="1" cellspacing="1" width="100%" align="center">
<tr>
<td colspan="4" align="center" valign="top" class="title">
<strong>{LN_FILTER_OTHERS}</strong></td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="50%" nowrap><b>{LN_FILTER_FACILITY}</b></td>
<td align="right" class="line1" nowrap>
<select name="filter_facility" size="8" multiple>
<!-- BEGIN filter_facility_list -->
<option {selected} value="{ID}">{DisplayName}</option>
<!-- END filter_facility_list -->
</select>
</td>
<td align="left" class="cellmenu2" width="50%" nowrap><b>{LN_FILTER_SEVERITY}</b></td>
<td align="right" class="line1" nowrap>
<select name="filter_severity" size="8" multiple>
<!-- BEGIN filter_severity_list -->
<option {selected} value="{ID}">{DisplayName}</option>
<!-- END filter_severity_list -->
</select>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="50%" valign="top" class="table_with_border">
<table border="0" cellpadding="1" cellspacing="1" width="100%" align="center">
<tr>
<td colspan="2" align="center" valign="top" class="title">
<strong>{LN_FILTER_MESSAGE}</strong></td>
</tr>
<tr>
<td align="center" class="line0" width="100%">
<input maxlength="2048" name="filter" size="70" title="Search" value="">
</td>
</tr>
</table>
</td>
<td width="10" valign="top" nowrap>&nbsp;</td>
<td width="50%" valign="top" class="table_with_border">
<table border="0" cellpadding="1" cellspacing="1" width="100%" align="center">
<tr>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_SYSLOGTAG}</b></td>
<td align="right" class="line1" nowrap>
<input maxlength="2048" name="filter" size="50" title="Search" value="">
</td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_SOURCE}</b></td>
<td align="right" class="line1" nowrap>
<input maxlength="2048" name="filter" size="50" title="Search" value="">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="3" valign="top" align="center">
<br>
<input name="search" type="submit" value="Perform Advanced Search" class="SearchFormControl">
</td>
</tr>
</table>
</form>
<br>
</div>
<script language="javascript">
// Run some needed javascript functions now!
togglevisibility('HiddenDateFromOptions', null);
toggleDatefiltervisibility('filterdateform');
</script>
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">

4
themes/default/main.css
View File

@ -375,7 +375,7 @@ A.cellmenu1_link:hover
}
/* Form elements */
select, input, button, textarea
select, input, button, textarea, .SelectSavedFilter
{
background-color: #E8E7E2;
color:#000000;
@ -393,4 +393,4 @@ select, input, button, textarea
font:bold 10px Verdana,Arial,Helvetica,sans-serif;
border: 1px solid;
border-color: #233B51 #124A7C #124A7C #233B51;
}
}