diff --git a/src/include/constants_general.php b/src/include/constants_general.php index a9ef9e1..c0eb746 100644 --- a/src/include/constants_general.php +++ b/src/include/constants_general.php @@ -178,6 +178,7 @@ define('IUT_IMAPProbe', '21'); define('IUT_NNTPProbe', '22'); define('IUT_WEVTMONV2', '23'); define('IUT_SMTPLISTENER', '24'); +define('IUT_APACHELOG', '10001'); $msgtype_colors[IUT_Unknown] = "#D0FBDC"; $msgtype_colors[IUT_Syslog] = "#D0FBF1"; $msgtype_colors[IUT_Heartbeat] = "#D0EEFB"; @@ -200,6 +201,7 @@ $msgtype_colors[IUT_IMAPProbe] = "#D0FBE8"; $msgtype_colors[IUT_NNTPProbe] = "#D0F7FB"; $msgtype_colors[IUT_WEVTMONV2] = "#CCE4D2"; $msgtype_colors[IUT_SMTPLISTENER] = "#CCE4DE"; +$msgtype_colors[IUT_APACHELOG] = "#E1FBD0"; // --- ?> \ No newline at end of file diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php index c7fce2d..202af10 100644 --- a/src/include/constants_logstream.php +++ b/src/include/constants_logstream.php @@ -58,6 +58,16 @@ define('SYSLOG_EVENT_LOGTYPE', 'NTEventLogType'); define('SYSLOG_EVENT_SOURCE', 'sourceproc'); define('SYSLOG_EVENT_CATEGORY', 'category'); define('SYSLOG_EVENT_USER', 'user'); + +// Weblog specific +define('SYSLOG_WEBLOG_USER', 'http_user'); +define('SYSLOG_WEBLOG_METHOD', 'http_method'); +define('SYSLOG_WEBLOG_URL', 'http_url'); +define('SYSLOG_WEBLOG_PVER', 'http_ver'); +define('SYSLOG_WEBLOG_STATUS', 'http_status'); +define('SYSLOG_WEBLOG_BYTESSEND', 'http_bytessend'); +define('SYSLOG_WEBLOG_REFERER', 'http_referer'); +define('SYSLOG_WEBLOG_USERAGENT', 'http_useragent'); // --- // Defines which kind of field types we have @@ -136,7 +146,7 @@ $fields[SYSLOG_PROCESSID]['DefaultWidth'] = "65"; $fields[SYSLOG_PROCESSID]['FieldAlign'] = "center"; $fields[SYSLOG_PROCESSID]['SearchField'] = "processid"; -// TODO! EventLog specific +// EventLog specific $fields[SYSLOG_EVENT_ID]['FieldID'] = SYSLOG_EVENT_ID; $fields[SYSLOG_EVENT_ID]['FieldCaptionID'] = 'LN_FIELDS_EVENTID'; $fields[SYSLOG_EVENT_ID]['FieldType'] = FILTER_TYPE_NUMBER; @@ -173,6 +183,64 @@ $fields[SYSLOG_EVENT_USER]['DefaultWidth'] = "85"; $fields[SYSLOG_EVENT_USER]['FieldAlign'] = "left"; $fields[SYSLOG_EVENT_USER]['SearchField'] = "eventuser"; +// Weblogfile specific +$fields[SYSLOG_WEBLOG_USER]['FieldID'] = SYSLOG_WEBLOG_USER; +$fields[SYSLOG_WEBLOG_USER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_USER'; +$fields[SYSLOG_WEBLOG_USER]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_USER]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_USER]['DefaultWidth'] = "75"; +$fields[SYSLOG_WEBLOG_USER]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_USER]['SearchField'] = SYSLOG_WEBLOG_USER; +$fields[SYSLOG_WEBLOG_METHOD]['FieldID'] = SYSLOG_WEBLOG_METHOD; +$fields[SYSLOG_WEBLOG_METHOD]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_METHOD'; +$fields[SYSLOG_WEBLOG_METHOD]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_METHOD]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_METHOD]['DefaultWidth'] = "50"; +$fields[SYSLOG_WEBLOG_METHOD]['FieldAlign'] = "center"; +$fields[SYSLOG_WEBLOG_METHOD]['SearchField'] = SYSLOG_WEBLOG_METHOD; +$fields[SYSLOG_WEBLOG_URL]['FieldID'] = SYSLOG_WEBLOG_URL; +$fields[SYSLOG_WEBLOG_URL]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_URL'; +$fields[SYSLOG_WEBLOG_URL]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_URL]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_URL]['DefaultWidth'] = "100%"; +$fields[SYSLOG_WEBLOG_URL]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_URL]['SearchField'] = SYSLOG_WEBLOG_URL; +$fields[SYSLOG_WEBLOG_PVER]['FieldID'] = SYSLOG_WEBLOG_PVER; +$fields[SYSLOG_WEBLOG_PVER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_PVER'; +$fields[SYSLOG_WEBLOG_PVER]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_PVER]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_PVER]['DefaultWidth'] = "50"; +$fields[SYSLOG_WEBLOG_PVER]['FieldAlign'] = "center"; +$fields[SYSLOG_WEBLOG_PVER]['SearchField'] = SYSLOG_WEBLOG_PVER; +$fields[SYSLOG_WEBLOG_STATUS]['FieldID'] = SYSLOG_WEBLOG_STATUS; +$fields[SYSLOG_WEBLOG_STATUS]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_STATUS'; +$fields[SYSLOG_WEBLOG_STATUS]['FieldType'] = FILTER_TYPE_NUMBER; +$fields[SYSLOG_WEBLOG_STATUS]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_STATUS]['DefaultWidth'] = "50"; +$fields[SYSLOG_WEBLOG_STATUS]['FieldAlign'] = "center"; +$fields[SYSLOG_WEBLOG_STATUS]['SearchField'] = SYSLOG_WEBLOG_STATUS; +$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldID'] = SYSLOG_WEBLOG_BYTESSEND; +$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_BYTESSEND'; +$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldType'] = FILTER_TYPE_NUMBER; +$fields[SYSLOG_WEBLOG_BYTESSEND]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_BYTESSEND]['DefaultWidth'] = "75"; +$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_BYTESSEND]['SearchField'] = SYSLOG_WEBLOG_BYTESSEND; +$fields[SYSLOG_WEBLOG_REFERER]['FieldID'] = SYSLOG_WEBLOG_REFERER; +$fields[SYSLOG_WEBLOG_REFERER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_REFERER'; +$fields[SYSLOG_WEBLOG_REFERER]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_REFERER]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_REFERER]['DefaultWidth'] = "100"; +$fields[SYSLOG_WEBLOG_REFERER]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_REFERER]['SearchField'] = SYSLOG_WEBLOG_REFERER; +$fields[SYSLOG_WEBLOG_USERAGENT]['FieldID'] = SYSLOG_WEBLOG_USERAGENT; +$fields[SYSLOG_WEBLOG_USERAGENT]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_USERAGENT'; +$fields[SYSLOG_WEBLOG_USERAGENT]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_USERAGENT]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_USERAGENT]['DefaultWidth'] = "100"; +$fields[SYSLOG_WEBLOG_USERAGENT]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_USERAGENT]['SearchField'] = SYSLOG_WEBLOG_USERAGENT; + // Message is the last element, this order is important for the Detail page for now! $fields[SYSLOG_MESSAGE]['FieldID'] = SYSLOG_MESSAGE; $fields[SYSLOG_MESSAGE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGE'; diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 7fac042..7834d92 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -203,6 +203,11 @@ function CreateLogLineTypesList( $selectedType ) $content['LOGLINETYPES']["winsyslog"]['type'] = "winsyslog"; $content['LOGLINETYPES']["winsyslog"]['DisplayName'] = "Adiscon WinSyslog"; if ( $selectedType == $content['LOGLINETYPES']["winsyslog"]['type'] ) { $content['LOGLINETYPES']["winsyslog"]['selected'] = "selected"; } else { $content['LOGLINETYPES']["winsyslog"]['selected'] = ""; } + + // Misc logline Types + $content['LOGLINETYPES']["misc"]['type'] = "misc"; + $content['LOGLINETYPES']["misc"]['DisplayName'] = "Miscellaneous logfiles"; + if ( $selectedType == $content['LOGLINETYPES']["misc"]['type'] ) { $content['LOGLINETYPES']["misc"]['selected'] = "selected"; } else { $content['LOGLINETYPES']["misc"]['selected'] = ""; } } function CreateSourceTypesList( $selectedSource ) diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 960f704..c95326a 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -171,6 +171,14 @@ $content['LN_FIELDS_MESSAGE'] = "Meldung"; $content['LN_FIELDS_EVENTSOURCE'] = "Event Source"; $content['LN_FIELDS_EVENTCATEGORY'] = "Event Category"; $content['LN_FIELDS_EVENTUSER'] = "Event User"; + $content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; + $content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; + $content['LN_FIELDS_WEBLOG_URL'] = "URL"; + $content['LN_FIELDS_WEBLOG_PVER'] = "Version"; + $content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; + $content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send"; + $content['LN_FIELDS_WEBLOG_REFERER'] = "Referer"; + $content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent"; // Install Page $content['LN_CFG_DBSERVER'] = "Datenbank Host"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 7fd5697..5c00294 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -171,6 +171,14 @@ $content['LN_FIELDS_EVENTLOGTYPE'] = "Eventlog Type"; $content['LN_FIELDS_EVENTSOURCE'] = "Event Source"; $content['LN_FIELDS_EVENTCATEGORY'] = "Event Category"; $content['LN_FIELDS_EVENTUSER'] = "Event User"; +$content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; +$content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; +$content['LN_FIELDS_WEBLOG_URL'] = "URL"; +$content['LN_FIELDS_WEBLOG_PVER'] = "Version"; +$content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; +$content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send"; +$content['LN_FIELDS_WEBLOG_REFERER'] = "Referer"; +$content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent"; // Install Page $content['LN_CFG_DBSERVER'] = "Database Host"; diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index 68c2b55..fcb5dcd 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -175,6 +175,14 @@ $content['LN_FIELDS_EVENTLOGTYPE'] = "Tipo do Evento"; $content['LN_FIELDS_EVENTSOURCE'] = "Origem do Evento"; $content['LN_FIELDS_EVENTCATEGORY'] = "Categoria do Evento"; $content['LN_FIELDS_EVENTUSER'] = "Evento de Usu´rio"; + $content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; + $content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; + $content['LN_FIELDS_WEBLOG_URL'] = "URL"; + $content['LN_FIELDS_WEBLOG_PVER'] = "Version"; + $content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; + $content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send"; + $content['LN_FIELDS_WEBLOG_REFERER'] = "Referer"; + $content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent"; // Install Page $content['LN_CFG_DBSERVER'] = "Servidor BD";