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

Added some icons for parser admin and made some fixes to it.

Browse Source
This commit is contained in:
Andre Lorbach 2008-10-10 17:02:50 +02:00
parent 362c5ca032
commit f13031c091
9 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/admin/parsers.php
View File

@ -288,6 +288,16 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
$myParsers['ParserHelpEnabled'] = true; $myParsers['ParserHelpEnabled'] = true;
else else
$myParsers['ParserHelpEnabled'] = false; $myParsers['ParserHelpEnabled'] = false;
// Find out if we need to INIT something!
if ( isset($myParsers['CustomFieldsList']) && count($myParsers['CustomFieldsList']) > 0 )
{
// $myParsers['CustomFieldsList'];
$myParsers['ParserInitEnabled'] = true;
}
// --- Set CSS Class // --- Set CSS Class
if ( $i % 2 == 0 ) if ( $i % 2 == 0 )

17
src/classes/msgparsers/msgparser.wireless.class.php
View File

@ -73,8 +73,23 @@ class MsgParser_wireless extends MsgParser {
// Public Information properties // Public Information properties
public $_ClassName = 'Custom Wireless Logfiles'; public $_ClassName = 'Custom Wireless Logfiles';
public $_ClassDescription = 'Custom logfile parser for wireless access points.'; public $_ClassDescription = 'Custom logfile parser for wireless access points.';
public $_ClassRequiredFields = null;
public $_ClassHelpArticle = ""; public $_ClassHelpArticle = "";
public $_ClassRequiredFields = array (
"net_bytesrecieved" => array ( "FieldID" => "net_bytesrecieved", "FieldDefine" => "SYSLOG_NET_BYTESRECIEVED", "FieldCaption" => "Bytes recieved", "FieldType" => 1, "FieldAlign" => "left", "SearchField" => "net_bytesrecieved", "DefaultWidth" => 50, "SearchOnline" => false, "Trunscate" => false, "Sortable" => false),
"net_bytessend" => array (", ", "FieldID" => "net_bytessend", "FieldDefine" => "SYSLOG_NET_BYTESSEND", "FieldCaption" => "Bytes send", "FieldType" => 1, "FieldAlign" => "left", "SearchField" => "net_bytessend", "DefaultWidth" => 50, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0 ),
"net_interface" => array (", ", "FieldID" => "net_interface", "FieldDefine" => "SYSLOG_NET_INTERFACE", "FieldCaption" => "Interface", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_interface", "DefaultWidth" => 100, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_lastactivity" => array (", ", "FieldID" => "net_lastactivity", "FieldDefine" => "SYSLOG_NET_LASTACTIVITY", "FieldCaption" => "Last Activity", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_lastactivity", "DefaultWidth" => 80, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_lastip" => array (", ", "FieldID" => "net_lastip", "FieldDefine" => "SYSLOG_NET_LASTIP", "FieldCaption" => "Last IP Address", "FieldType" => 0, "FieldAlign" => "left", "SearchField" => "net_lastip", "DefaultWidth" => 100, "SearchOnline" => 1, "Trunscate" => 0, "Sortable" => 0),
"net_mac_address" => array (", ", "FieldID" => "net_mac_address", "FieldDefine" => "SYSLOG_NET_MAC_ADDRESS", "FieldCaption" => "Mac Address", "FieldType" => 0, "FieldAlign" => "left", "SearchField" => "net_mac_address", "DefaultWidth" => 125, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_packetsrecieved" => array (", ", "FieldID" => "net_packetsrecieved", "FieldDefine" => "SYSLOG_NET_PACKETSRECIEVED", "FieldCaption" => "Packets recieved", "FieldType" => 1, "FieldAlign" => "left", "SearchField" => "net_packetsrecieved", "DefaultWidth" => 50, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_packetssend" => array (", ", "FieldID" => "net_packetssend", "FieldDefine" => "SYSLOG_NET_PACKETSSEND", "FieldCaption" => "Packets send", "FieldType" => 1, "FieldAlign" => "left", "SearchField" => "net_packetssend", "DefaultWidth" => 50, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_rxrate" => array (", ", "FieldID" => "net_rxrate", "FieldDefine" => "SYSLOG_NET_RXRATE", "FieldCaption" => "RX Rate", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_rxrate", "DefaultWidth" => 65, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_signalstrength" => array (", ", "FieldID" => "net_signalstrength", "FieldDefine" => "SYSLOG_NET_SIGNALSTRENGTH", "FieldCaption" => "Signal strength", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_signalstrength", "DefaultWidth" => 100, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_signaltonoise" => array (", ", "FieldID" => "net_signaltonoise", "FieldDefine" => "SYSLOG_NET_SIGNALTONOISE", "FieldCaption" => "Signal to noise", "FieldType" => 1, "FieldAlign" => "center", "SearchField" => "net_signaltonoise", "DefaultWidth" => 50, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_uptime" => array (", ", "FieldID" => "net_uptime", "FieldDefine" => "SYSLOG_NET_UPTIME", "FieldCaption" => "System Uptime", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_uptime", "DefaultWidth" => 85, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_txccq" => array (", ", "FieldID" => "net_txccq", "FieldDefine" => "SYSLOG_NET_TXCCQ", "FieldCaption" => "TX CCQ", "FieldType" => 1, "FieldAlign" => "center", "SearchField" => "net_txccq", "DefaultWidth" => 50, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0),
"net_txrate" => array (", ", "FieldID" => "net_txrate", "FieldDefine" => "SYSLOG_NET_TXRATE", "FieldCaption" => "TX Rate", "FieldType" => 0, "FieldAlign" => "center", "SearchField" => "net_txrate", "DefaultWidth" => 65, "SearchOnline" => 0, "Trunscate" => 0, "Sortable" => 0)
);
// Constructor // Constructor
public function MsgParser_wireless() { public function MsgParser_wireless() {

BIN
src/images/icons/gear_delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/images/icons/gear_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/images/icons/information2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 884 B

3
src/include/functions_common.php
View File

@ -621,6 +621,9 @@ function InitFrontEndVariables()
$content['MENU_FIELDS'] = $content['BASEPATH'] . "images/icons/tables.png"; $content['MENU_FIELDS'] = $content['BASEPATH'] . "images/icons/tables.png";
$content['MENU_DELETE_FROMDB'] = $content['BASEPATH'] . "images/icons/data_delete.png"; $content['MENU_DELETE_FROMDB'] = $content['BASEPATH'] . "images/icons/data_delete.png";
$content['MENU_DELETE_FROMDB_DISABLED'] = $content['BASEPATH'] . "images/icons/data_delete_disabled.png"; $content['MENU_DELETE_FROMDB_DISABLED'] = $content['BASEPATH'] . "images/icons/data_delete_disabled.png";
$content['MENU_INFORMATION'] = $content['BASEPATH'] . "images/icons/information2.png";
$content['MENU_PARSER_DELETE'] = $content['BASEPATH'] . "images/icons/gear_delete.png";
$content['MENU_PARSER_INIT'] = $content['BASEPATH'] . "images/icons/gear_new.png";
$content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png"; $content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png";
$content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png"; $content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png";

7
src/include/functions_config.php
View File

@ -238,12 +238,13 @@ function InitMessageParsers()
if ( $tmpParser->_ClassRequiredFields != null && count($tmpParser->_ClassRequiredFields) > 0 ) if ( $tmpParser->_ClassRequiredFields != null && count($tmpParser->_ClassRequiredFields) > 0 )
{ {
$bCustomFields = true; $bCustomFields = true;
$bCustomFieldList = $tmpParser->_ClassRequiredFields; $aCustomFieldList = $tmpParser->_ClassRequiredFields;
// print_r ( $aCustomFieldList );
} }
else else
{ {
$bCustomFields = false; $bCustomFields = false;
$bCustomFieldList = null; $aCustomFieldList = null;
} }
// Add entry to msg parser list! // Add entry to msg parser list!
@ -252,7 +253,7 @@ function InitMessageParsers()
"DisplayName" => $szParserName, "DisplayName" => $szParserName,
"Description" => $szParserDescription, "Description" => $szParserDescription,
"CustomFields" => $bCustomFields, "CustomFields" => $bCustomFields,
"CustomFieldsList" => $bCustomFieldList, "CustomFieldsList" => $aCustomFieldList,
"ParserHelpArticle" => $szParserHelpArticle, "ParserHelpArticle" => $szParserHelpArticle,
); );
} }

6
src/lang/en/admin.php
View File

@ -304,9 +304,9 @@ $content['LN_PARSERS_NAME'] = "Parser Name";
$content['LN_PARSERS_DESCRIPTION'] = "Short Description"; $content['LN_PARSERS_DESCRIPTION'] = "Short Description";
$content['LN_PARSERS_ERROR_NOPARSERS'] = "There were no valid message parsers found in your installation. "; $content['LN_PARSERS_ERROR_NOPARSERS'] = "There were no valid message parsers found in your installation. ";
$content['LN_PARSERS_HELP'] = "Help"; $content['LN_PARSERS_HELP'] = "Help";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_INFO'] = "Show more Information for this message parser.";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_INIT'] = "Initialize settings for this message parser.";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_REMOVE'] = "Remove settings for this message parser.";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_'] = "";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_'] = "";
$content['LN_PARSERS_'] = ""; $content['LN_PARSERS_'] = "";

42
src/templates/admin/admin_parsers.html
View File

@ -27,29 +27,35 @@
<td align="center" width="100" class="cellmenu1"><b>{LN_PARSERS_ID}</b></td> <td align="center" width="100" class="cellmenu1"><b>{LN_PARSERS_ID}</b></td>
<td align="center" width="200" class="cellmenu1"><b>{LN_PARSERS_NAME}</b></td> <td align="center" width="200" class="cellmenu1"><b>{LN_PARSERS_NAME}</b></td>
<td align="center" width="300" class="cellmenu1"><b>{LN_PARSERS_DESCRIPTION}</b></td> <td align="center" width="300" class="cellmenu1"><b>{LN_PARSERS_DESCRIPTION}</b></td>
<td align="center" width="50" class="cellmenu1"><b>{LN_PARSERS_HELP}</b></td> <td align="center" width="125" class="cellmenu1" colspan="3" nowrap><b>{LN_GEN_ACTIONS}</b></td>
<td align="center" width="125" class="cellmenu1"><b>{LN_GEN_ACTIONS}</b></td>
</tr> </tr>
<!-- BEGIN PARSERS --> <!-- BEGIN PARSERS -->
<tr> <tr>
<td align="left" class="{cssclass}" valign="top"><b>{ID}</b></td> <td align="left" class="{cssclass}" valign="top"><b>{ID}</b></td>
<td align="left" class="{cssclass}" valign="top"><a href="{BASEPATH}admin/parsers.php?op=edit&id={ID}">{DisplayName}</a></td> <td align="left" class="{cssclass}" valign="top"><a href="{BASEPATH}admin/parsers.php?op=edit&id={ID}">{DisplayName}</a></td>
<td align="left" class="{cssclass}" valign="top">{Description}</td> <td align="left" class="{cssclass}" valign="top">{Description}</td>
<td align="center" class="{cssclass}" valign="top"> <td align="center" class="{cssclass}">
<!-- IF ParserHelpEnabled="true" --> <!-- IF ParserHelpEnabled="true" -->
<a href="{ParserHelpArticle}"><img src="{MENU_HELP}" width="16" title="{LN_PARSERS_HELP}"></a> <a href="{ParserHelpArticle}"><img src="{MENU_HELP}" width="16" title="{LN_PARSERS_HELP}"></a>
<!-- ENDIF ParserHelpEnabled="true" --> <!-- ENDIF ParserHelpEnabled="true" -->
</td> </td>
<td align="center" class="{cssclass}"> <td align="center" class="{cssclass}">
&nbsp;<a href="{BASEPATH}admin/parsers.php?op=detailsedit&id={ID}"><img src="{MENU_EDIT}" width="16" title="{LN_PARSERS_EDIT}"></a> <a href="{BASEPATH}admin/parsers.php?op=details&id={ID}"><img src="{MENU_INFORMATION}" width="16" title="{LN_PARSERS_INFO}"></a>
&nbsp;<a href="{BASEPATH}admin/parsers.php?op=delete&id={ID}"><img src="{MENU_DELETE}" width="16" title="{LN_PARSERS_DELETE}"></a> </td>
<td align="center" class="{cssclass}">
<!-- IF ParserInitEnabled="true" -->
&nbsp;<a href="{BASEPATH}admin/parsers.php?op=initparser&id={ID}"><img src="{MENU_PARSER_INIT}" width="16" title="{LN_PARSERS_INIT}"></a>
<!-- ENDIF ParserInitEnabled="true" -->
<!-- IF ParserDeleteEnabled="true" -->
&nbsp;<a href="{BASEPATH}admin/parsers.php?op=removeparser&id={ID}"><img src="{MENU_PARSER_DELETE}" width="16" title="{LN_PARSERS_REMOVE}"></a>
<!-- ENDIF ParserDeleteEnabled="true" -->
</td> </td>
</tr> </tr>
<!-- END PARSERS --> <!-- END PARSERS -->
</table> </table>
<!-- ENDIF LISTPARSERS="true" --> <!-- ENDIF LISTPARSERS="true" -->
<!-- IF ISEDITORNEWSEARCH="true" --> <!-- IF ISSHOWDETAILS="true" -->
<form action="{BASEPATH}admin/searches.php" method="post"> <form action="{BASEPATH}admin/searches.php" method="post">
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate"> <table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate">
<tr> <tr>
@ -63,22 +69,6 @@
<td align="left" class="cellmenu2"><b>{LN_GEN_USERONLY}</b></td> <td align="left" class="cellmenu2"><b>{LN_GEN_USERONLY}</b></td>
<td align="right" class="line2"><input type="text" name="SearchQuery" size="55" maxlength="1024" value="{SearchQuery}"></td> <td align="right" class="line2"><input type="text" name="SearchQuery" size="55" maxlength="1024" value="{SearchQuery}"></td>
</tr> </tr>
<tr>
<td align="left" class="cellmenu2"><b>{LN_GEN_USERONLY}</b></td>
<td align="right" class="line1"><input type="checkbox" name="isuseronly" value="{userid}" {CHECKED_ISUSERONLY}></td>
</tr>
<!-- IF ISGROUPSAVAILABLE="true" -->
<tr>
<td align="left" class="cellmenu2"><b>{LN_GEN_GROUPONLY}</b></td>
<td align="right" class="line2">
<select name="groupid" size="1" STYLE="width: 300px">
<!-- BEGIN SUBGROUPS -->
<option value="{mygroupid}" {group_selected}>{groupname}</option>
<!-- END SUBGROUPS -->
</select>
</td>
</tr>
<!-- ENDIF ISGROUPSAVAILABLE="true" -->
<tr> <tr>
<td align="center" colspan="2"> <td align="center" colspan="2">
<input type="submit" value="{SEARCH_SENDBUTTON}"> <input type="submit" value="{SEARCH_SENDBUTTON}">
@ -88,7 +78,7 @@
</tr> </tr>
</table> </table>
</form> </form>
<!-- ENDIF ISEDITORNEWSEARCH="true" --> <!-- ENDIF ISSHOWDETAILS="true" -->
<br><br> <br><br>