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

Merge branch 'beta' into detailview

Browse Source
This commit is contained in:
Andre Lorbach 2008-04-28 11:44:42 +02:00
commit 79ce6d78ae
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/include/constants_logstream.php
View File

@ -136,19 +136,19 @@ $fields[SYSLOG_MESSAGE]['FieldAlign'] = "left";
// ---
// --- Define default Database field mappings!
$dbmapping['winsyslog'][SYSLOG_UID] = "ID";
$dbmapping['winsyslog'][SYSLOG_DATE] = "DeviceReportedTime";
$dbmapping['winsyslog'][SYSLOG_HOST] = "FromHost";
$dbmapping['winsyslog'][SYSLOG_MESSAGETYPE] = "InfoUnitID";
$dbmapping['winsyslog'][SYSLOG_MESSAGE] = "Message";
$dbmapping['winsyslog'][SYSLOG_FACILITY] = "Facility";
$dbmapping['winsyslog'][SYSLOG_SEVERITY] = "Priority";
$dbmapping['winsyslog'][SYSLOG_SYSLOGTAG] = "SysLogTag";
$dbmapping['winsyslog'][SYSLOG_EVENT_ID] = "EventID";
$dbmapping['winsyslog'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
$dbmapping['winsyslog'][SYSLOG_EVENT_SOURCE] = "EventSource";
$dbmapping['winsyslog'][SYSLOG_EVENT_CATEGORY] = "EventCategory";
$dbmapping['winsyslog'][SYSLOG_EVENT_USER] = "EventUser";
$dbmapping['monitorware'][SYSLOG_UID] = "ID";
$dbmapping['monitorware'][SYSLOG_DATE] = "DeviceReportedTime";
$dbmapping['monitorware'][SYSLOG_HOST] = "FromHost";
$dbmapping['monitorware'][SYSLOG_MESSAGETYPE] = "InfoUnitID";
$dbmapping['monitorware'][SYSLOG_MESSAGE] = "Message";
$dbmapping['monitorware'][SYSLOG_FACILITY] = "Facility";
$dbmapping['monitorware'][SYSLOG_SEVERITY] = "Priority";
$dbmapping['monitorware'][SYSLOG_SYSLOGTAG] = "SysLogTag";
$dbmapping['monitorware'][SYSLOG_EVENT_ID] = "EventID";
$dbmapping['monitorware'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
$dbmapping['monitorware'][SYSLOG_EVENT_SOURCE] = "EventSource";
$dbmapping['monitorware'][SYSLOG_EVENT_CATEGORY] = "EventCategory";
$dbmapping['monitorware'][SYSLOG_EVENT_USER] = "EventUser";
$dbmapping['syslogng'][SYSLOG_UID] = "seq";
$dbmapping['syslogng'][SYSLOG_DATE] = "datetime";

7
src/include/functions_config.php
View File

@ -86,9 +86,14 @@
$content['Sources'][$iSourceID]['ObjRef']->DBServer = $mysource['DBServer'];
$content['Sources'][$iSourceID]['ObjRef']->DBName = $mysource['DBName'];
$content['Sources'][$iSourceID]['ObjRef']->DBType = $mysource['DBType'];
$content['Sources'][$iSourceID]['ObjRef']->DBTableType = $mysource['DBTableType'];
$content['Sources'][$iSourceID]['ObjRef']->DBTableName = $mysource['DBTableName'];
// Legacy handling for tabletype!
if ( isset($mysource['DBTableType']) && strtolower($mysource['DBTableType']) == "winsyslog" )
$content['Sources'][$iSourceID]['ObjRef']->DBTableType = "monitorware"; // Convert to MonitorWare!
else
$content['Sources'][$iSourceID]['ObjRef']->DBTableType = strtolower($mysource['DBTableType']);
// Optional parameters!
if ( isset($mysource['DBPort']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBPort = $mysource['DBPort']; }
if ( isset($mysource['DBUser']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBUser = $mysource['DBUser']; }

11
src/include/functions_filters.php
View File

@ -207,7 +207,7 @@ function GetFacilityDisplayName( $nFacilityID )
}
// Default
return "Unknown Facility";
return "Unknown Facility($nFacilityID)";
}
function GetSeverityDisplayName( $nSeverityID )
@ -221,7 +221,7 @@ function GetSeverityDisplayName( $nSeverityID )
}
// Default
return "Unknown Severity";
return "Unknown Severity($nSeverityID)";
}
function GetMessageTypeDisplayName( $nMsgTypeID )
@ -235,7 +235,7 @@ function GetMessageTypeDisplayName( $nMsgTypeID )
}
// Default
return "Unknown";
return "Unknown MessageType($nMsgTypeID)";
}
@ -249,9 +249,8 @@ function GetTimeStampFromTimeString($szTimeString)
}
else
{
//WTF?
die ("WTF GetTimeStampFromTimeString " . $szTimeString);
return 0;
OutputDebugMessage("Unparseable Time in GetTimeStampFromTimeString - '" . $szTimeString . "'");
return $szTimeString;
}
}