RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-01 07:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: Log's time from UTC to local (#27777)

Browse Source 
mgr/dashboard: Log's time from UTC to local

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
This commit is contained in:
Lenz Grimmer 2019-06-18 12:14:09 +02:00 committed by GitHub
commit 363c81a858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
<div class="well"> <div class="well">
<div *ngIf="clog"> <div *ngIf="clog">
<p *ngFor="let line of clog"> <p *ngFor="let line of clog">
<span class="timestamp">{{ line.stamp }}</span> <span class="timestamp">{{ line.stamp | cdDate }}</span>
<span class="priority {{ line.priority | logPriority }}">{{ line.priority }}</span> <span class="priority {{ line.priority | logPriority }}">{{ line.priority }}</span>
<span class="message">{{ line.message }}</span> <span class="message">{{ line.message }}</span>
</p> </p>
@ -22,7 +22,7 @@
<div class="well"> <div class="well">
<div *ngIf="audit_log"> <div *ngIf="audit_log">
<p *ngFor="let line of audit_log"> <p *ngFor="let line of audit_log">
<span class="timestamp">{{ line.stamp }}</span> <span class="timestamp">{{ line.stamp | cdDate }}</span>
<span class="priority {{ line.priority | logPriority }}">{{ line.priority }}</span> <span class="priority {{ line.priority | logPriority }}">{{ line.priority }}</span>
<span class="message">{{ line.message }}</span> <span class="message">{{ line.message }}</span>
</p> </p>

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

@ -1,3 +1,4 @@
import { DatePipe } from '@angular/common';
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, OnDestroy, OnInit } from '@angular/core';
import { LogsService } from '../../../shared/api/logs.service'; import { LogsService } from '../../../shared/api/logs.service';
@ -28,7 +29,7 @@ export class LogsComponent implements OnInit, OnDestroy {
selectedDate: Date; selectedDate: Date;
startTime: Date = new Date(); startTime: Date = new Date();
endTime: Date = new Date(); endTime: Date = new Date();
constructor(private logsService: LogsService) { constructor(private logsService: LogsService, private datePipe: DatePipe) {
this.startTime.setHours(0, 0); this.startTime.setHours(0, 0);
this.endTime.setHours(23, 59); this.endTime.setHours(23, 59);
} }
@ -81,8 +82,9 @@ export class LogsComponent implements OnInit, OnDestroy {
filterExecutor(logs: Array<any>, filters: any): Array<any> { filterExecutor(logs: Array<any>, filters: any): Array<any> {
return logs.filter((line) => { return logs.filter((line) => {
const hour = parseInt(line.stamp.slice(11, 13), 10); const localDate = this.datePipe.transform(line.stamp, 'mediumTime');
const minutes = parseInt(line.stamp.slice(14, 16), 10); const hour = parseInt(localDate.split(':')[0], 10);
const minutes = parseInt(localDate.split(':')[1], 10);
let prio: string, y_m_d: string, timeSpan: number; let prio: string, y_m_d: string, timeSpan: number;
prio = filters.priority === 'All' ? line.priority : filters.priority; prio = filters.priority === 'All' ? line.priority : filters.priority;