mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-26 03:09:21 +02:00
Merge branch 'v2-stable' into beta
Conflicts: src/include/constants_logstream.php
This commit is contained in:
commit
8e7e349176
@ -6,6 +6,8 @@ Version 2.9.0 (beta), 2010-01-14
|
||||
Version 2.8.0 (v2-stable), 2010-01-14
|
||||
- Merged previous Beta branch into Stable branch and set
|
||||
new version number 2.8
|
||||
- As of RFC5424, changed ProcessID Field into string valuetype, which has
|
||||
effect on how searches are done.
|
||||
---------------------------------------------------------------------------
|
||||
Version 2.7.3 (beta), 2009-11-17
|
||||
- Merged bugfixes and changes from 2.6.5 stable into beta branch
|
||||
|
@ -170,7 +170,7 @@ $fields[SYSLOG_SYSLOGTAG]['SearchOnline'] = true;
|
||||
$fields[SYSLOG_PROCESSID]['FieldID'] = SYSLOG_PROCESSID;
|
||||
$fields[SYSLOG_PROCESSID]['FieldDefine'] = 'SYSLOG_PROCESSID';
|
||||
$fields[SYSLOG_PROCESSID]['FieldCaption'] = 'ProcessID';
|
||||
$fields[SYSLOG_PROCESSID]['FieldType'] = FILTER_TYPE_NUMBER;
|
||||
$fields[SYSLOG_PROCESSID]['FieldType'] = FILTER_TYPE_STRING;
|
||||
$fields[SYSLOG_PROCESSID]['Sortable'] = true;
|
||||
$fields[SYSLOG_PROCESSID]['DefaultWidth'] = "65";
|
||||
$fields[SYSLOG_PROCESSID]['FieldAlign'] = "center";
|
||||
@ -357,6 +357,7 @@ $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_CATEGORY] = "EventCategory"
|
||||
$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_USER] = "EventUser";
|
||||
$dbmapping['monitorware']['DBMAPPINGS'][MISC_SYSTEMID] = "SystemID";
|
||||
$dbmapping['monitorware']['DBMAPPINGS'][MISC_CHECKSUM] = "Checksum";
|
||||
//$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_PROCESSID] = "ProcessID";
|
||||
|
||||
$dbmapping['syslogng']['ID'] = "syslogng";
|
||||
$dbmapping['syslogng']['DisplayName'] = "SyslogNG";
|
||||
|
Loading…
x
Reference in New Issue
Block a user