mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-25 18:59:12 +02:00
Added custom parser for wireless logs, and made further adjustments to the new custom field code
This commit is contained in:
Andre Lorbach
parent
4f4a14a87f
commit
7a1f097262
@ -195,7 +195,7 @@ if ( isset($_POST['op']) )
|
||||
if ( isset($_POST['NewFieldType']) && isset($content['FILTERTYPES'][$_POST['NewFieldType']]) ) { $content['FieldType'] = intval($_POST['NewFieldType']); } else if ( isset($_POST['FieldType']) && isset($content['FILTERTYPES'][$_POST['FieldType']]) ) { $content['FieldType'] = intval($_POST['FieldType']); } else { $content['FieldType'] = FILTER_TYPE_STRING; }
|
||||
|
||||
// Checkbox fields
|
||||
if ( isset($_POST['SearchOnline']) ) { $content['SearchOnline'] = true; } else {$content['SearchOnline'] = false; }
|
||||
if ( isset($_POST['SearchOnline']) ) { $content['SearchOnline'] = "true"; } else { $content['SearchOnline'] = "false"; }
|
||||
// NOT USED YET if ( isset ($_POST['Sortable']) ) { $content['Sortable'] = true; } else {$content['Sortable'] = false; }
|
||||
|
||||
// --- Check mandotary values
|
||||
@ -228,40 +228,25 @@ if ( isset($_POST['op']) )
|
||||
$myrow = DB_GetSingleRow($result, true);
|
||||
if ( !isset($myrow['FieldID']) )
|
||||
{
|
||||
/*
|
||||
if ( $_POST['op'] == "editfield" )
|
||||
{
|
||||
// Show error in this case
|
||||
$content['ISERROR'] = true;
|
||||
$content['ERROR_MSG'] = GetAndReplaceLangStr( $content['LN_FIELDS_ERROR_IDNOTFOUND'], $content['FieldID'] );
|
||||
}
|
||||
else
|
||||
*/
|
||||
{
|
||||
// Add custom Field now!
|
||||
$sqlquery = "INSERT INTO " . DB_FIELDS . " (FieldID, FieldCaption, FieldDefine, SearchField, FieldAlign, DefaultWidth, FieldType, SearchOnline)
|
||||
VALUES (
|
||||
'" . $content['FieldID'] . "',
|
||||
'" . $content['FieldCaption'] . "',
|
||||
'" . $content['FieldDefine'] . "',
|
||||
'" . $content['SearchField'] . "',
|
||||
'" . $content['FieldAlign'] . "',
|
||||
" . $content['DefaultWidth'] . ",
|
||||
" . $content['FieldType'] . ",
|
||||
" . $content['SearchOnline'] . "
|
||||
)";
|
||||
$result = DB_Query($sqlquery);
|
||||
DB_FreeQuery($result);
|
||||
|
||||
// Do the final redirect
|
||||
RedirectResult( GetAndReplaceLangStr( $content['LN_FIELDS_HASBEENADDED'], $content['FieldCaption'] ) , "fields.php" );
|
||||
}
|
||||
// Add custom Field now!
|
||||
$sqlquery = "INSERT INTO " . DB_FIELDS . " (FieldID, FieldCaption, FieldDefine, SearchField, FieldAlign, DefaultWidth, FieldType, SearchOnline)
|
||||
VALUES (
|
||||
'" . $content['FieldID'] . "',
|
||||
'" . $content['FieldCaption'] . "',
|
||||
'" . $content['FieldDefine'] . "',
|
||||
'" . $content['SearchField'] . "',
|
||||
'" . $content['FieldAlign'] . "',
|
||||
" . $content['DefaultWidth'] . ",
|
||||
" . $content['FieldType'] . ",
|
||||
" . $content['SearchOnline'] . "
|
||||
)";
|
||||
$result = DB_Query($sqlquery);
|
||||
DB_FreeQuery($result);
|
||||
|
||||
// Do the final redirect
|
||||
RedirectResult( GetAndReplaceLangStr( $content['LN_FIELDS_HASBEENADDED'], $content['FieldCaption'] ) , "fields.php" );
|
||||
}
|
||||
/* if ( $_POST['op'] == "addnewfield" )
|
||||
{
|
||||
}
|
||||
else if ( $_POST['op'] == "editfield" )
|
||||
*/
|
||||
else
|
||||
{
|
||||
|
||||
// Edit the Search Entry now!
|
||||
|
||||
166
src/classes/msgparsers/msgparser.wireless.class.php
Normal file
166
src/classes/msgparsers/msgparser.wireless.class.php
Normal file
@ -0,0 +1,166 @@
|
||||
<?php
|
||||
/*
|
||||
*********************************************************************
|
||||
* -> www.phplogcon.org <- *
|
||||
* ----------------------------------------------------------------- *
|
||||
* Apache Logfile Parser used to split WebLog fields if
|
||||
* found in the msg.
|
||||
*
|
||||
* This Parser is for custom wireless access point logformat
|
||||
* *
|
||||
* All directives are explained within this file *
|
||||
*
|
||||
* Copyright (C) 2008 Adiscon GmbH.
|
||||
*
|
||||
* This file is part of phpLogCon.
|
||||
*
|
||||
* PhpLogCon is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* PhpLogCon is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with phpLogCon. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* A copy of the GPL can be found in the file "COPYING" in this
|
||||
* distribution.
|
||||
*********************************************************************
|
||||
*/
|
||||
|
||||
/*
|
||||
* NEEDED FIELDS!
|
||||
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_interface', 'SYSLOG_NET_INTERFACE', 'Interface', 0, 0, 100, 'center', 'net_interface', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_mac_address', 'SYSLOG_NET_MAC_ADDRESS', 'Mac Address', 0, 0, 100, 'left', 'net_mac_address', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_lastip', 'SYSLOG_NET_LASTIP', 'Last IP Address', 0, 0, 85, 'center', 'net_lastip', 1, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_rxrate', 'SYSLOG_NET_RXRATE', 'RX Rate', 0, 0, 50, 'center', 'net_rxrate', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_txrate', 'SYSLOG_NET_TXRATE', 'TX Rate', 0, 0, 50, 'center', 'net_txrate', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_uptime', 'SYSLOG_NET_UPTIME', 'System Uptime', 0, 0, 85, 'center', 'net_uptime', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_lastactivity', 'SYSLOG_NET_LASTACTIVITY', 'Last Activity', 0, 0, 80, 'center', 'net_lastactivity', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_signalstrength', 'SYSLOG_NET_SIGNALSTRENGTH', 'Signal strength', 0, 0, 50, 'center', 'net_signalstrength', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_signaltonoise', 'SYSLOG_NET_SIGNALTONOISE', 'Signal to noise', 1, 0, 50, 'center', 'net_signaltonoise', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_txccq', 'SYSLOG_NET_TXCCQ', 'TX CCQ', 1, 0, 50, 'center', 'net_txccq', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_bytesrecieved', 'SYSLOG_NET_BYTESRECIEVED', 'Bytes recieved', 1, 0, 50, 'left', 'net_bytesrecieved', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_bytessend', 'SYSLOG_NET_BYTESSEND', 'Bytes send', 1, 0, 50, 'left', 'net_bytessend', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_packetsrecieved', 'SYSLOG_NET_PACKETSRECIEVED', 'Packets recieved', 1, 0, 50, 'left', 'net_packetsrecieved', 0, 0);
|
||||
INSERT INTO `logcon_fields` (`FieldID`, `FieldDefine`, `FieldCaption`, `FieldType`, `Sortable`, `DefaultWidth`, `FieldAlign`, `SearchField`, `SearchOnline`, `Trunscate`) VALUES ('net_packetssend', 'SYSLOG_NET_PACKETSSEND', 'Packets send', 1, 0, 50, 'left', 'net_packetssend', 0, 0);
|
||||
|
||||
|
||||
*/
|
||||
|
||||
// --- Avoid directly accessing this file!
|
||||
if ( !defined('IN_PHPLOGCON') )
|
||||
{
|
||||
die('Hacking attempt');
|
||||
exit;
|
||||
}
|
||||
// ---
|
||||
|
||||
// --- Basic Includes
|
||||
require_once($gl_root_path . 'classes/enums.class.php');
|
||||
require_once($gl_root_path . 'classes/msgparser.class.php');
|
||||
require_once($gl_root_path . 'include/constants_errors.php');
|
||||
require_once($gl_root_path . 'include/constants_logstream.php');
|
||||
// ---
|
||||
|
||||
class MsgParser_wireless extends MsgParser {
|
||||
// protected $_arrProperties = null;
|
||||
|
||||
// Constructor
|
||||
public function MsgParser_wireless() {
|
||||
|
||||
// TODO AUTOMATICALLY PERFORM FIELD INSERTS!
|
||||
|
||||
return; // Nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* ParseLine
|
||||
*
|
||||
* @param arrArguments array in&out: properties of interest. There can be no guarantee the logstream can actually deliver them.
|
||||
* @return integer Error stat
|
||||
*/
|
||||
public function ParseMsg($szMsg, &$arrArguments)
|
||||
{
|
||||
global $content, $fields;
|
||||
|
||||
//trim the msg first to remove spaces from begin and end
|
||||
$szMsg = trim($szMsg);
|
||||
//return ERROR_MSG_NOMATCH;
|
||||
|
||||
// Sample: script,info INICIO; Madrid-penalver ;wlan1 ;00:15:AF:9E:02:94 ;192.168.10.30 ;36Mbps ;24Mbps ;01:21:39 ;00:00:00.030 ;82dBm@1Mbps ;15 ;66 ;16852066,2147105 ;17288,12903
|
||||
if ( preg_match('/(.*?),(.*?) (.*?);(.*?);(.*?);(.*?);(.*?);(.*?);(.*?);(.*?);(.*?);(.*?);(.[0-9]{1,12}.);(.[0-9]{1,12}.);(.[0-9]{1,12}.),(.[0-9]{1,12}.);(.[0-9]{1,12}.),(.[0-9]{1,12}.)$/', $szMsg, $out ) )
|
||||
{
|
||||
|
||||
//print_r ( $out );
|
||||
//exit;
|
||||
|
||||
// Set generic properties
|
||||
$arrArguments[SYSLOG_HOST] = $out[4];
|
||||
// $arrArguments[SYSLOG_DATE] = GetEventTime($out[4]);
|
||||
|
||||
// Set wlan log specific properties!
|
||||
$arrArguments[SYSLOG_NET_INTERFACE] = trim($out[5]);
|
||||
$arrArguments[SYSLOG_NET_MAC_ADDRESS] = trim($out[6]);
|
||||
$arrArguments[SYSLOG_NET_LASTIP] = trim($out[7]);
|
||||
$arrArguments[SYSLOG_NET_RXRATE] = trim($out[8]);
|
||||
$arrArguments[SYSLOG_NET_TXRATE] = trim($out[9]);
|
||||
$arrArguments[SYSLOG_NET_UPTIME] = trim($out[10]);
|
||||
$arrArguments[SYSLOG_NET_LASTACTIVITY] = trim($out[11]);
|
||||
$arrArguments[SYSLOG_NET_SIGNALSTRENGTH] = trim($out[12]);
|
||||
|
||||
// Number based fields
|
||||
$arrArguments[SYSLOG_NET_SIGNALTONOISE] = $out[13];
|
||||
$arrArguments[SYSLOG_NET_TXCCQ] = $out[14];
|
||||
$arrArguments[SYSLOG_NET_BYTESRECIEVED] = $out[15];
|
||||
$arrArguments[SYSLOG_NET_BYTESSEND] = $out[16];
|
||||
$arrArguments[SYSLOG_NET_PACKETSRECIEVED] = $out[17];
|
||||
$arrArguments[SYSLOG_NET_PACKETSSEND] = $out[18];
|
||||
|
||||
// Set msg to whole logline
|
||||
$arrArguments[SYSLOG_MESSAGE] = $out[0];
|
||||
|
||||
if ( $this->_MsgNormalize == 1 )
|
||||
{
|
||||
//Init tmp msg
|
||||
$szTmpMsg = "";
|
||||
|
||||
// Create Field Array to prepend into msg! Reverse Order here
|
||||
$myFields = array( SYSLOG_SOURCE, SYSLOG_NET_INTERFACE, SYSLOG_NET_MAC_ADDRESS, SYSLOG_NET_LASTIP, SYSLOG_NET_RXRATE, SYSLOG_NET_TXRATE, SYSLOG_NET_UPTIME, SYSLOG_NET_LASTACTIVITY, SYSLOG_NET_SIGNALSTRENGTH, SYSLOG_NET_SIGNALTONOISE, SYSLOG_NET_TXCCQ, SYSLOG_NET_BYTESRECIEVED, SYSLOG_NET_BYTESSEND, SYSLOG_NET_PACKETSRECIEVED, SYSLOG_NET_PACKETSSEND );
|
||||
|
||||
foreach ( $myFields as $myField )
|
||||
{
|
||||
// Set Field Caption
|
||||
if ( isset($fields[$myField]['FieldCaption']) )
|
||||
$szFieldName = $fields[$myField]['FieldCaption'];
|
||||
else
|
||||
$szFieldName = $myField;
|
||||
|
||||
// Append Field into msg
|
||||
$szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg;
|
||||
}
|
||||
|
||||
// copy finished MSG back!
|
||||
$arrArguments[SYSLOG_MESSAGE] = $szTmpMsg;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// return no match in this case!
|
||||
return ERROR_MSG_NOMATCH;
|
||||
}
|
||||
|
||||
// Set IUT Property if success!
|
||||
$arrArguments[SYSLOG_MESSAGETYPE] = IUT_Syslog;
|
||||
|
||||
// If we reached this position, return success!
|
||||
return SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
Loading…
x
Reference in New Issue
Block a user