From 65ee03f6ae32ee3e82a054898ba2cc92483371ec Mon Sep 17 00:00:00 2001 From: Paolo Date: Mon, 14 Sep 2020 15:01:33 +0200 Subject: [PATCH] - Added new constant OPT_MINUTES to FilterWidgetLib - Now is it possible to use minutes and hours in the FilterWidget - LogsViewer tool now displays milliseconds for execution time column - Changed filters for LogsViewer tool --- application/libraries/FilterWidgetLib.php | 7 +- .../views/system/logs/logsViewerData.php | 11 +- public/js/FilterWidget.js | 2 + system/filtersupdate.php | 160 +++++++++++++++--- 4 files changed, 154 insertions(+), 26 deletions(-) diff --git a/application/libraries/FilterWidgetLib.php b/application/libraries/FilterWidgetLib.php index f909c7083..0a4526680 100644 --- a/application/libraries/FilterWidgetLib.php +++ b/application/libraries/FilterWidgetLib.php @@ -93,6 +93,7 @@ class FilterWidgetLib const OP_NOT_SET = 'nset'; // Filter options values + const OPT_MINUTES = 'minutes'; const OPT_HOURS = 'hours'; const OPT_DAYS = 'days'; const OPT_MONTHS = 'months'; @@ -887,7 +888,8 @@ class FilterWidgetLib && isset($filterDefinition->option) && ($filterDefinition->option == self::OPT_HOURS || $filterDefinition->option == self::OPT_DAYS - || $filterDefinition->option == self::OPT_MONTHS)) + || $filterDefinition->option == self::OPT_MONTHS + || $filterDefinition->option == self::OPT_MINUTES)) { $condition = '< (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)'; } @@ -903,7 +905,8 @@ class FilterWidgetLib && isset($filterDefinition->option) && ($filterDefinition->option == self::OPT_HOURS || $filterDefinition->option == self::OPT_DAYS - || $filterDefinition->option == self::OPT_MONTHS)) + || $filterDefinition->option == self::OPT_MONTHS + || $filterDefinition->option == self::OPT_MINUTES)) { $condition = '> (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)'; } diff --git a/application/views/system/logs/logsViewerData.php b/application/views/system/logs/logsViewerData.php index 13a4207ab..f8476df6a 100644 --- a/application/views/system/logs/logsViewerData.php +++ b/application/views/system/logs/logsViewerData.php @@ -25,7 +25,7 @@ ), 'formatRow' => function($datasetRaw) { - $datasetRaw->ExecutionTime = date_format(date_create($datasetRaw->ExecutionTime), 'd.m.Y H:i:s'); + $datasetRaw->ExecutionTime = date_format(date_create($datasetRaw->ExecutionTime), 'd.m.Y H:i:s:u'); return $datasetRaw; }, @@ -33,22 +33,22 @@ $mark = ''; - if ($datasetRaw->RequestId == 'Cronjob error') + if (strpos($datasetRaw->RequestId, 'error') != false) { $mark = 'text-red'; } - if ($datasetRaw->RequestId == 'Cronjob info') + if (strpos($datasetRaw->RequestId, 'info') != false) { $mark = 'text-green'; } - if ($datasetRaw->RequestId == 'Cronjob warning') + if (strpos($datasetRaw->RequestId, 'warning') != false) { $mark = 'text-orange'; } - if ($datasetRaw->RequestId == 'Cronjob debug') + if (strpos($datasetRaw->RequestId, 'debug') != false) { $mark = 'text-info'; } @@ -63,3 +63,4 @@ echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray); ?> + diff --git a/public/js/FilterWidget.js b/public/js/FilterWidget.js index a85969865..f63c41013 100644 --- a/public/js/FilterWidget.js +++ b/public/js/FilterWidget.js @@ -824,6 +824,8 @@ var FHC_FilterWidget = { html += ""; html += ""; html += " "; diff --git a/system/filtersupdate.php b/system/filtersupdate.php index d6bb88976..4069e734d 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -438,13 +438,13 @@ $filters = array( array( 'app' => 'core', 'dataset_name' => 'logs', - 'filter_kurzbz' => 'last7days', - 'description' => '{Last 7 days logs}', + 'filter_kurzbz' => 'last1min', + 'description' => '{Last minute logs}', 'sort' => 1, 'default_filter' => true, 'filter' => ' { - "name": "All logs from the last 7 days", + "name": "All logs from the last minute", "columns": [ {"name": "RequestId"}, {"name": "ExecutionTime"}, @@ -456,8 +456,8 @@ $filters = array( { "name": "ExecutionTime", "operation": "lt", - "condition": "7", - "option": "days" + "condition": "1", + "option": "minutes" } ] } @@ -467,13 +467,13 @@ $filters = array( array( 'app' => 'core', 'dataset_name' => 'logs', - 'filter_kurzbz' => 'jobs14days', - 'description' => '{Last 14 days jobs logs}', + 'filter_kurzbz' => 'jobs24hours', + 'description' => '{Last 24 hours jobs logs}', 'sort' => 2, 'default_filter' => false, 'filter' => ' { - "name": "All jobs logs from the last 14 days", + "name": "All jobs logs from the last 24 hours", "columns": [ {"name": "RequestId"}, {"name": "ExecutionTime"}, @@ -487,11 +487,133 @@ $filters = array( "operation": "contains", "condition": "job" }, + { + "name": "RequestId", + "operation": "contains", + "condition": "JOB" + }, { "name": "ExecutionTime", "operation": "lt", - "condition": "14", - "option": "days" + "condition": "24", + "option": "hours" + } + ] + } + ', + 'oe_kurzbz' => null, + ), + array( + 'app' => 'core', + 'dataset_name' => 'logs', + 'filter_kurzbz' => 'jobs48hours', + 'description' => '{Last 48 hours jobs logs}', + 'sort' => 2, + 'default_filter' => false, + 'filter' => ' + { + "name": "All jobs logs from the last 48 hours", + "columns": [ + {"name": "RequestId"}, + {"name": "ExecutionTime"}, + {"name": "ExecutedBy"}, + {"name": "Description"}, + {"name": "Data"} + ], + "filters": [ + { + "name": "WebserviceType", + "operation": "contains", + "condition": "job" + }, + { + "name": "RequestId", + "operation": "contains", + "condition": "JOB" + }, + { + "name": "ExecutionTime", + "operation": "lt", + "condition": "48", + "option": "hours" + } + ] + } + ', + 'oe_kurzbz' => null, + ), + array( + 'app' => 'core', + 'dataset_name' => 'logs', + 'filter_kurzbz' => 'jqws24hours', + 'description' => '{Last 24 hours job queue workers logs}', + 'sort' => 2, + 'default_filter' => false, + 'filter' => ' + { + "name": "All job queue workers logs from the last 24 hours", + "columns": [ + {"name": "RequestId"}, + {"name": "ExecutionTime"}, + {"name": "ExecutedBy"}, + {"name": "Description"}, + {"name": "Data"} + ], + "filters": [ + { + "name": "WebserviceType", + "operation": "contains", + "condition": "job" + }, + { + "name": "RequestId", + "operation": "contains", + "condition": "JQW" + }, + { + "name": "ExecutionTime", + "operation": "lt", + "condition": "24", + "option": "hours" + } + ] + } + ', + 'oe_kurzbz' => null, + ), + array( + 'app' => 'core', + 'dataset_name' => 'logs', + 'filter_kurzbz' => 'jqws48hours', + 'description' => '{Last 48 hours job queue workers logs}', + 'sort' => 2, + 'default_filter' => false, + 'filter' => ' + { + "name": "All job queue workers logs from the last 48 hours", + "columns": [ + {"name": "RequestId"}, + {"name": "ExecutionTime"}, + {"name": "ExecutedBy"}, + {"name": "Description"}, + {"name": "Data"} + ], + "filters": [ + { + "name": "WebserviceType", + "operation": "contains", + "condition": "job" + }, + { + "name": "RequestId", + "operation": "contains", + "condition": "JQW" + }, + { + "name": "ExecutionTime", + "operation": "lt", + "condition": "48", + "option": "hours" } ] } @@ -535,13 +657,13 @@ $filters = array( array( 'app' => 'core', 'dataset_name' => 'logs', - 'filter_kurzbz' => 'content3days', - 'description' => '{Last 3 days content logs}', + 'filter_kurzbz' => 'content3minutes', + 'description' => '{Last 3 minutes content logs}', 'sort' => 4, 'default_filter' => false, 'filter' => ' { - "name": "All content logs from the last 3 days", + "name": "All content logs from the last 3 minutes", "columns": [ {"name": "RequestId"}, {"name": "ExecutionTime"}, @@ -559,7 +681,7 @@ $filters = array( "name": "ExecutionTime", "operation": "lt", "condition": "3", - "option": "days" + "option": "minutes" } ] } @@ -569,13 +691,13 @@ $filters = array( array( 'app' => 'core', 'dataset_name' => 'logs', - 'filter_kurzbz' => 'wienerlinien7days', - 'description' => '{Last 7 days wiener linien logs}', + 'filter_kurzbz' => 'wienerlinien24hours', + 'description' => '{Last 24 hours Wiener Linien logs}', 'sort' => 5, 'default_filter' => false, 'filter' => ' { - "name": "All wiener linien logs from the last 7 days", + "name": "All Wiener Linien logs from the last 24 hours", "columns": [ {"name": "RequestId"}, {"name": "ExecutionTime"}, @@ -592,8 +714,8 @@ $filters = array( { "name": "ExecutionTime", "operation": "lt", - "condition": "7", - "option": "days" + "condition": "24", + "option": "hours" } ] }