diff --git a/src/admin/charts.php b/src/admin/charts.php index ee57907..e4d1ed2 100644 --- a/src/admin/charts.php +++ b/src/admin/charts.php @@ -507,8 +507,6 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) ) $myChart['ChartEnabledImage'] = $content["MENU_SELECTION_DISABLED"]; $myChart['set_enabled'] = 1; } - - // --- // --- Set Chart default Filterstring diff --git a/src/images/icons/Thumbs.db b/src/images/icons/Thumbs.db deleted file mode 100644 index ef393f8..0000000 Binary files a/src/images/icons/Thumbs.db and /dev/null differ diff --git a/src/images/icons/selection_delete_disabled.png b/src/images/icons/selection_delete_disabled.png new file mode 100644 index 0000000..8af72c9 Binary files /dev/null and b/src/images/icons/selection_delete_disabled.png differ diff --git a/src/include/config.sample.php b/src/include/config.sample.php index 5426519..cf39fc9 100644 --- a/src/include/config.sample.php +++ b/src/include/config.sample.php @@ -133,10 +133,10 @@ $CFG['Search'][] = array ( "DisplayName" => "All messages from last 31 days", "S // --- // --- 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']['Charts2'] = 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']['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']['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']['Chart2'] = array ( "DisplayName" => "SyslogTags", "chart_type" => CHART_CAKE, "chart_width" => 400, "chart_field" => SYSLOG_SYSLOGTAG, "maxrecords" => 10, "showpercent" => 0, "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']['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 diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 93d81c3..4190712 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -723,6 +723,7 @@ function InitFrontEndVariables() $content['MENU_SEARCH'] = $content['BASEPATH'] . "images/icons/view.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_DISABLED'] = $content['BASEPATH'] . "images/icons/selection_delete_disabled.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_FIND'] = $content['BASEPATH'] . "images/icons/find.png"; diff --git a/src/templates/admin/admin_charts.html b/src/templates/admin/admin_charts.html index 66cf85c..1e64b1c 100644 --- a/src/templates/admin/admin_charts.html +++ b/src/templates/admin/admin_charts.html @@ -43,7 +43,14 @@ {DisplayName} - + + + + + + + + {ChartTypeText} {ChartAssignedToText}