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

Fixed filter dialog issue parsing message filters wrong in Report Admin Panel.

Browse Source 
Added missing mapping for ProcessID field into logstream constants.
This commit is contained in:
Andre Lorbach 2011-02-25 13:56:29 +01:00
parent 65d8e3606a
commit e73f3c1601
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/admin/reports.php
View File

@ -688,29 +688,30 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
} }
else if ( $tmpField['FieldType'] == FILTER_TYPE_STRING ) else if ( $tmpField['FieldType'] == FILTER_TYPE_STRING )
{ {
// Append Fieldname // Append Fieldname, if set!
$szFilterString .= $tmpField['SearchField']; if (isset($tmpField['SearchField']) && strlen($tmpField['SearchField']) > 0 )
$szFilterString .= $tmpField['SearchField'] . ":";
// Append comparison // Append comparison
switch ( $tmpComparison ) switch ( $tmpComparison )
{ {
case 1: // FILTER_MODE_INCLUDE case 1: // FILTER_MODE_INCLUDE
$szFilterString .= ":"; $szFilterString .= "";
break; break;
case 2: // FILTER_MODE_EXCLUDE case 2: // FILTER_MODE_EXCLUDE
$szFilterString .= ":-"; $szFilterString .= "-";
break; break;
case 5: // FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHFULL case 5: // FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHFULL
$szFilterString .= ":="; $szFilterString .= "=";
break; break;
case 6: // FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHFULL case 6: // FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHFULL
$szFilterString .= ":-="; $szFilterString .= "-=";
break; break;
case 9: // FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHREGEX case 9: // FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHREGEX
$szFilterString .= ":~"; $szFilterString .= "~";
break; break;
case 10: // FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHREGEX case 10: // FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHREGEX
$szFilterString .= ":-~"; $szFilterString .= "-~";
break; break;
} }
@ -770,14 +771,17 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
} }
else if ( $myNewField['FieldType'] == FILTER_TYPE_STRING ) else if ( $myNewField['FieldType'] == FILTER_TYPE_STRING )
{ {
// Append sample filter // Searchfield filter
$szFilterString .= $myNewField['SearchField']. ":sample"; if (isset($myNewField['SearchField']) && strlen($myNewField['SearchField']) > 0 )
$szFilterString .= $myNewField['SearchField'] . ":";
// Append sample
$szFilterString .= "sample";
} }
} }
// Append to Filterstring // Append to Filterstring
} }
} }
// Copy Final Filterstring if necessary // Copy Final Filterstring if necessary
if ( strlen($szFilterString) > 0 ) if ( strlen($szFilterString) > 0 )
$content['filterString'] = $szFilterString; $content['filterString'] = $szFilterString;

1
src/include/constants_logstream.php
View File

@ -350,6 +350,7 @@ $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_MESSAGE] = "Message";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_FACILITY] = "Facility"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_FACILITY] = "Facility";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SEVERITY] = "Priority"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SEVERITY] = "Priority";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SYSLOGTAG] = "SysLogTag"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SYSLOGTAG] = "SysLogTag";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_PROCESSID] = "ProcessID";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_ID] = "EventID"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_ID] = "EventID";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_LOGTYPE] = "EventLogType"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_SOURCE] = "EventSource"; $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_SOURCE] = "EventSource";