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

Merge pull request #51 from vsc55/#49

Browse Source 
Fix, Disable the button in the Enabled column, Charts Options
This commit is contained in:
Andre Lorbach 2020-05-08 17:06:48 +02:00 committed by GitHub
commit 6bfe5506cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/charts.php
View File

@ -507,8 +507,6 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
$myChart['ChartEnabledImage'] = $content["MENU_SELECTION_DISABLED"]; $myChart['ChartEnabledImage'] = $content["MENU_SELECTION_DISABLED"];
$myChart['set_enabled'] = 1; $myChart['set_enabled'] = 1;
} }
// --- // ---
// --- Set Chart default Filterstring // --- Set Chart default Filterstring

BIN
src/images/icons/Thumbs.db
View File

Binary file not shown.

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

8
src/include/config.sample.php
View File

@ -133,10 +133,10 @@ $CFG['Search'][] = array ( "DisplayName" => "All messages from last 31 days", "S
// --- // ---
// --- Predefined Charts! // --- Predefined Charts!
$CFG['Charts']['Charts1'] = array ( "DisplayName" => "Top Hosts", "chart_type" => CHART_BARS_HORIZONTAL, "chart_width" => 400, "chart_field" => SYSLOG_HOST, "maxrecords" => 10, "showpercent" => 0, "chart_enabled" => 1 ); $CFG['Charts']['Chart1'] = array ( "DisplayName" => "Top Hosts", "chart_type" => CHART_BARS_HORIZONTAL, "chart_width" => 400, "chart_field" => SYSLOG_HOST, "maxrecords" => 10, "showpercent" => 0, "chart_enabled" => 1 );
$CFG['Charts']['Charts2'] = array ( "DisplayName" => "SyslogTags", "chart_type" => CHART_CAKE, "chart_width" => 400, "chart_field" => SYSLOG_SYSLOGTAG, "maxrecords" => 10, "showpercent" => 0, "chart_enabled" => 1 ); $CFG['Charts']['Chart2'] = array ( "DisplayName" => "SyslogTags", "chart_type" => CHART_CAKE, "chart_width" => 400, "chart_field" => SYSLOG_SYSLOGTAG, "maxrecords" => 10, "showpercent" => 0, "chart_enabled" => 1 );
$CFG['Charts']['Charts3'] = array ( "DisplayName" => "Severity Occurences", "chart_type" => CHART_BARS_VERTICAL, "chart_width" => 400, "chart_field" => SYSLOG_SEVERITY, "maxrecords" => 10, "showpercent" => 1, "chart_enabled" => 1 ); $CFG['Charts']['Chart3'] = array ( "DisplayName" => "Severity Occurences", "chart_type" => CHART_BARS_VERTICAL, "chart_width" => 400, "chart_field" => SYSLOG_SEVERITY, "maxrecords" => 10, "showpercent" => 1, "chart_enabled" => 1 );
$CFG['Charts']['Charts4'] = array ( "DisplayName" => "Usage by Day", "chart_type" => CHART_CAKE, "chart_width" => 400, "chart_field" => SYSLOG_DATE, "maxrecords" => 10, "showpercent" => 1, "chart_enabled" => 1 ); $CFG['Charts']['Chart4'] = array ( "DisplayName" => "Usage by Day", "chart_type" => CHART_CAKE, "chart_width" => 400, "chart_field" => SYSLOG_DATE, "maxrecords" => 10, "showpercent" => 1, "chart_enabled" => 1 );
// --- // ---
// --- Configure allowed directories for File base logstream sources // --- Configure allowed directories for File base logstream sources

1
src/include/functions_common.php
View File

@ -723,6 +723,7 @@ function InitFrontEndVariables()
$content['MENU_SEARCH'] = $content['BASEPATH'] . "images/icons/view.png"; $content['MENU_SEARCH'] = $content['BASEPATH'] . "images/icons/view.png";
$content['MENU_SELECTION_DISABLED'] = $content['BASEPATH'] . "images/icons/selection.png"; $content['MENU_SELECTION_DISABLED'] = $content['BASEPATH'] . "images/icons/selection.png";
$content['MENU_SELECTION_ENABLED'] = $content['BASEPATH'] . "images/icons/selection_delete.png"; $content['MENU_SELECTION_ENABLED'] = $content['BASEPATH'] . "images/icons/selection_delete.png";
$content['MENU_SELECTION_ENABLED_DISABLED'] = $content['BASEPATH'] . "images/icons/selection_delete_disabled.png";
$content['MENU_TEXT_FIND'] = $content['BASEPATH'] . "images/icons/text_find.png"; $content['MENU_TEXT_FIND'] = $content['BASEPATH'] . "images/icons/text_find.png";
$content['MENU_EARTH_FIND'] = $content['BASEPATH'] . "images/icons/earth_find.png"; $content['MENU_EARTH_FIND'] = $content['BASEPATH'] . "images/icons/earth_find.png";
$content['MENU_FIND'] = $content['BASEPATH'] . "images/icons/find.png"; $content['MENU_FIND'] = $content['BASEPATH'] . "images/icons/find.png";

9
src/templates/admin/admin_charts.html
View File

@ -43,7 +43,14 @@
<b>{DisplayName}</b> <b>{DisplayName}</b>
<!-- ENDIF ActionsAllowed!="true" --> <!-- ENDIF ActionsAllowed!="true" -->
</td> </td>
<td align="center" class="{cssclass}"><a href="{BASEPATH}admin/charts.php?miniop=setenabled&id={ID}&newval={set_enabled}" id="chartenablebutton{ID}"><img src="{ChartEnabledImage}" width="16" align="center" title="{LN_CHARTS_SETENABLEDSTATE}"></a></td> <td align="center" class="{cssclass}">
<!-- IF ActionsAllowed="true" -->
<a href="{BASEPATH}admin/charts.php?miniop=setenabled&id={ID}&newval={set_enabled}" id="chartenablebutton{ID}"><img src="{ChartEnabledImage}" width="16" align="center" title="{LN_CHARTS_SETENABLEDSTATE}"></a>
<!-- ENDIF ActionsAllowed="true" -->
<!-- IF ActionsAllowed!="true" -->
<img src="{MENU_SELECTION_ENABLED_DISABLED}" width="16" align="center" title="{LN_GEN_DISABLED}">
<!-- ENDIF ActionsAllowed!="true" -->
</td>
<td align="left" class="{cssclass}"><img src="{ChartTypeImage}" width="16" align="left"> <b>{ChartTypeText}</b></td> <td align="left" class="{cssclass}"><img src="{ChartTypeImage}" width="16" align="left"> <b>{ChartTypeText}</b></td>
<td align="left" class="{cssclass}"><img src="{ChartAssignedToImage}" width="16" align="left"> <b>{ChartAssignedToText}</b></td> <td align="left" class="{cssclass}"><img src="{ChartAssignedToImage}" width="16" align="left"> <b>{ChartAssignedToText}</b></td>
<td align="center" class="{cssclass}"> <td align="center" class="{cssclass}">