openstack/venus-dashboard
Code Issues Proposed changes

Add host_name condition

Browse Source 
Change-Id: I5e545bdb682f99d3a3de546543a072d07e3b3b02
This commit is contained in:
baiziyu 2022-09-30 17:05:29 +08:00
parent 1ac23d9a77
commit 305d2f50f5
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
venus_dashboard/api/venus.py
View File

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

3
venus_dashboard/api/venus_rest_api.py
View File

@ -42,4 +42,5 @@ class Logs(generic.View):
page_size = request.GET.get('page_size', 20)
page_num = request.GET.get('page_num', 1)
module_name = request.GET.get('module_name', 1)
return venus.logs(request, start_time, end_time, page_size, page_num, module_name)
host_name = request.GET.get('host_name', 1)
return venus.logs(request, start_time, end_time, page_size, page_num, module_name, host_name)

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

@ -27,11 +27,15 @@
end_time: $scope.model.end_time.getTime() / 1000,
page_size: $scope.model.page_size,
page_num: $scope.model.page_num,
module_name: ''
module_name: '',
host_name: ''
};
if ($scope.model.condition == 'module_name') {
config.module_name = $scope.model.condition_value;
}
if ($scope.model.condition == 'host_name') {
config.host_name = $scope.model.condition_value;
}
venusSrv.getLogs(config).then(function (res) {
$scope.tableData = [];
if (res.data.hasOwnProperty('data')) {

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

@ -1,4 +1,4 @@
<link rel="stylesheet" type="text/css" href="/static/dashboard/admin/venus/logSearch//logSearch.css">
<link rel="stylesheet" type="text/css" href="/static/dashboard/admin/venus/logSearch/logSearch.css">
<div ng-controller="LogSearchController as vm">
<div>
<div>
@ -13,6 +13,7 @@
<div class="form-group">
<select class="form-control" ng-model="model.condition">
<option value="module_name">模块</option>
<option value="host_name">主机</option>
</select>
</div>
<div class="form-group">