RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34770 from Exotelis/wip-42963

Browse Source 
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
This commit is contained in:
Lenz Grimmer 2020-10-02 10:23:18 +02:00 committed by GitHub
commit 3314844fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/dashboard/controllers/logs.py
View File

@ -49,7 +49,7 @@ class Logs(BaseController):
def load_buffer(self, buf, channel_name):
lines = CephService.send_command(
'mon', 'log last', channel=channel_name, num=LOG_BUFFER_SIZE)
'mon', 'log last', channel=channel_name, num=LOG_BUFFER_SIZE, level='debug')
for l in lines:
buf.appendleft(l)

15
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
View File

@ -18,8 +18,7 @@
<span class="message">{{ line.message }}</span>
</p>
<span *ngIf="contentData.clog.length === 0"
i18n>No entries found</span>
<ng-container *ngIf="clog.length != 0 else noEntriesTpl"></ng-container>
</div>
</div>
</ng-template>
@ -37,8 +36,7 @@
<span class="message">{{ line.message }}</span>
</p>
<span *ngIf="contentData.audit_log.length === 0"
i18n>No entries found</span>
<ng-container *ngIf="audit_log.length != 0 else noEntriesTpl"></ng-container>
</div>
</div>
</ng-template>
@ -96,6 +94,7 @@
id="logs-date"
placeholder="YYYY-MM-DD"
ngbDatepicker
[maxDate]="maxDate"
#d="ngbDatepicker"
(click)="d.open()"
[(ngModel)]="selectedDate"
@ -124,3 +123,11 @@
</div>
</div>
</ng-template>
<ng-template #noEntriesTpl>
<span i18n>No log entries found. Please try to select different filter options.</span>
<span>&nbsp;</span>
<a href="#"
(click)="resetFilter()"
i18n>Reset filter.</a>
</ng-template>

4
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.scss
View File

@ -37,6 +37,10 @@ p {
.info {
color: bd.$info;
}
.debug {
color: bd.$gray-700;
}
}
::ng-deep cd-logs ngb-timepicker input.ngb-tp-input {

16
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
View File

@ -19,6 +19,7 @@ export class LogsComponent implements OnInit, OnDestroy {
interval: number;
priorities: Array<{ name: string; value: string }> = [
{ name: 'Debug', value: '[DBG]' },
{ name: 'Info', value: '[INF]' },
{ name: 'Warning', value: '[WRN]' },
{ name: 'Error', value: '[ERR]' },
@ -29,6 +30,11 @@ export class LogsComponent implements OnInit, OnDestroy {
selectedDate: NgbDateStruct;
startTime = { hour: 0, minute: 0 };
endTime = { hour: 23, minute: 59 };
maxDate = {
year: new Date().getFullYear(),
month: new Date().getMonth() + 1,
day: new Date().getDate()
};
constructor(
private logsService: LogsService,
@ -120,4 +126,14 @@ export class LogsComponent implements OnInit, OnDestroy {
this.selectedDate = null;
this.filterLogs();
}
resetFilter() {
this.priority = 'All';
this.search = '';
this.selectedDate = null;
this.startTime = { hour: 0, minute: 0 };
this.endTime = { hour: 23, minute: 59 };
this.filterLogs();
return false;
}
}

4
src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.ts
View File

@ -5,7 +5,9 @@ import { Pipe, PipeTransform } from '@angular/core';
})
export class LogPriorityPipe implements PipeTransform {
transform(value: any): any {
if (value === '[INF]') {
if (value === '[DBG]') {
return 'debug';
} else if (value === '[INF]') {
return 'info';
} else if (value === '[WRN]') {
return 'warn';