diff --git a/venus_dashboard/api/venus.py b/venus_dashboard/api/venus.py index d0b5776..60ae3b2 100644 --- a/venus_dashboard/api/venus.py +++ b/venus_dashboard/api/venus.py @@ -41,10 +41,13 @@ def log_storage_days(request): return venusclient(request).config.get_days() -def logs(request, start_time, end_time, page_size, page_num, module_name, host_name): +def logs(request, start_time, end_time, page_size, page_num, module_name, + host_name, program_name, level): return venusclient(request).search.get_log(start_time=start_time, end_time=end_time, page_size=page_size, page_num=page_num, module_name=module_name, - host_name=host_name) + host_name=host_name, + program_name=program_name, + level=level) diff --git a/venus_dashboard/api/venus_rest_api.py b/venus_dashboard/api/venus_rest_api.py index c7af299..f56de43 100644 --- a/venus_dashboard/api/venus_rest_api.py +++ b/venus_dashboard/api/venus_rest_api.py @@ -41,6 +41,9 @@ class Logs(generic.View): end_time = request.GET.get('end_time', 0) page_size = request.GET.get('page_size', 20) page_num = request.GET.get('page_num', 1) - module_name = request.GET.get('module_name', 1) - host_name = request.GET.get('host_name', 1) - return venus.logs(request, start_time, end_time, page_size, page_num, module_name, host_name) + module_name = request.GET.get('module_name', '') + host_name = request.GET.get('host_name', '') + program_name = request.GET.get('program_name', '') + level = request.GET.get('level', '') + return venus.logs(request, start_time, end_time, page_size, page_num, + module_name, host_name, program_name, level) diff --git a/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.controller.js b/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.controller.js index 7769e56..8a02358 100644 --- a/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.controller.js +++ b/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.controller.js @@ -28,7 +28,9 @@ page_size: $scope.model.page_size, page_num: $scope.model.page_num, module_name: '', - host_name: '' + host_name: '', + program_name: '', + level: '' }; if ($scope.model.condition == 'module_name') { config.module_name = $scope.model.condition_value; @@ -36,6 +38,12 @@ if ($scope.model.condition == 'host_name') { config.host_name = $scope.model.condition_value; } + if ($scope.model.condition == 'program_name') { + config.program_name = $scope.model.condition_value; + } + if ($scope.model.condition == 'level') { + config.level = $scope.model.condition_value; + } venusSrv.getLogs(config).then(function (res) { $scope.tableData = []; if (res.data.hasOwnProperty('data')) { diff --git a/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.html b/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.html index fd6cc82..a1f663b 100644 --- a/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.html +++ b/venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.html @@ -14,6 +14,8 @@