openstack/venus-dashboard
Code Issues Proposed changes

Add program_name and level conditions.

Browse Source 
Closes-Bug: 1991082
Change-Id: Ib09345e904b87a46e897d8114423c377e432ce55
This commit is contained in:
baiziyu 2022-09-30 17:37:30 +08:00
parent 305d2f50f5
commit 21a3a2dbdb
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
venus_dashboard/api/venus.py
View File

@ -41,10 +41,13 @@ def log_storage_days(request):
return venusclient(request).config.get_days() 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, return venusclient(request).search.get_log(start_time=start_time,
end_time=end_time, end_time=end_time,
page_size=page_size, page_size=page_size,
page_num=page_num, page_num=page_num,
module_name=module_name, module_name=module_name,
host_name=host_name) host_name=host_name,
program_name=program_name,
level=level)

9
venus_dashboard/api/venus_rest_api.py
View File

@ -41,6 +41,9 @@ class Logs(generic.View):
end_time = request.GET.get('end_time', 0) end_time = request.GET.get('end_time', 0)
page_size = request.GET.get('page_size', 20) page_size = request.GET.get('page_size', 20)
page_num = request.GET.get('page_num', 1) page_num = request.GET.get('page_num', 1)
module_name = request.GET.get('module_name', 1) module_name = request.GET.get('module_name', '')
host_name = request.GET.get('host_name', 1) host_name = request.GET.get('host_name', '')
return venus.logs(request, start_time, end_time, page_size, page_num, module_name, 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)

10
venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.controller.js
View File

@ -28,7 +28,9 @@
page_size: $scope.model.page_size, page_size: $scope.model.page_size,
page_num: $scope.model.page_num, page_num: $scope.model.page_num,
module_name: '', module_name: '',
host_name: '' host_name: '',
program_name: '',
level: ''
}; };
if ($scope.model.condition == 'module_name') { if ($scope.model.condition == 'module_name') {
config.module_name = $scope.model.condition_value; config.module_name = $scope.model.condition_value;
@ -36,6 +38,12 @@
if ($scope.model.condition == 'host_name') { if ($scope.model.condition == 'host_name') {
config.host_name = $scope.model.condition_value; 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) { venusSrv.getLogs(config).then(function (res) {
$scope.tableData = []; $scope.tableData = [];
if (res.data.hasOwnProperty('data')) { if (res.data.hasOwnProperty('data')) {

2
venus_dashboard/static/dashboard/admin/venus/logSearch/logSearch.html
View File

@ -14,6 +14,8 @@
<select class="form-control" ng-model="model.condition"> <select class="form-control" ng-model="model.condition">
<option value="module_name">模块</option> <option value="module_name">模块</option>
<option value="host_name">主机</option> <option value="host_name">主机</option>
<option value="program_name">组件</option>
<option value="level">级别</option>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">