From: Kanika Murarka <kmurarka@redhat.com>
Date: Thu, 25 Apr 2019 10:51:04 +0000 (+0530)
Subject: mgr/dashboard: Log's time from UTC to local
X-Git-Tag: v15.1.0~2441^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=305961db414b8c86fd1dee53e76d4fbd7aa5513f;p=ceph.git

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

Fixes: https://tracker.ceph.com/issues/39297
Signed-off-by: Kanika Murarka <kmurarka@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
index a2c7d2389ebd..c455894c1eb1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
@@ -6,7 +6,7 @@
   <div class="well">
     <div *ngIf="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="message">{{ line.message }}</span>
       </p>
@@ -22,7 +22,7 @@
   <div class="well">
     <div *ngIf="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="message">{{ line.message }}</span>
       </p>
@@ -42,7 +42,7 @@
       <select class="form-control"
               [(ngModel)]="priority"
               (ngModelChange)="filterLogs()">
-        <option class="form-control" 
+        <option class="form-control"
                 *ngFor="let prio of prioritys"
                 [value]="prio.value">{{ prio.name }}</option>
       </select>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
index cd20503c3a35..1ffc1610c7d6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
@@ -1,3 +1,4 @@
+import { DatePipe } from '@angular/common';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import { LogsService } from '../../../shared/api/logs.service';
@@ -28,7 +29,7 @@ export class LogsComponent implements OnInit, OnDestroy {
   selectedDate: Date;
   startTime: Date = new Date();
   endTime: Date = new Date();
-  constructor(private logsService: LogsService) {
+  constructor(private logsService: LogsService, private datePipe: DatePipe) {
     this.startTime.setHours(0, 0);
     this.endTime.setHours(23, 59);
   }
@@ -81,8 +82,9 @@ export class LogsComponent implements OnInit, OnDestroy {
 
   filterExecutor(logs: Array<any>, filters: any): Array<any> {
     return logs.filter((line) => {
-      const hour = parseInt(line.stamp.slice(11, 13), 10);
-      const minutes = parseInt(line.stamp.slice(14, 16), 10);
+      const localDate = this.datePipe.transform(line.stamp, 'mediumTime');
+      const hour = parseInt(localDate.split(':')[0], 10);
+      const minutes = parseInt(localDate.split(':')[1], 10);
       let prio: string, y_m_d: string, timeSpan: number;
 
       prio = filters.priority === 'All' ? line.priority : filters.priority;