[#5172] Health check time is always in the Pacific timezone (#6933)

* Fix timezone issue * Changed moment timezone to moment
yugabyte · Jan 22, 2021 · edfe17b · edfe17b
1 parent 8ed5f8d
commit edfe17b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/managed/devops/bin/cluster_health.py b/managed/devops/bin/cluster_health.py
@@ -430,7 +430,7 @@ def seconds_to_human_readable_time(seconds):
 
 
 def local_time():
-    return datetime.utcnow().replace(tzinfo=tz.tzutc()).astimezone(tz.gettz('America/Los_Angeles'))
+    return datetime.utcnow().replace(tzinfo=tz.tzutc())
 
 
 ###################################################################################################

diff --git a/managed/ui/src/components/universes/UniverseDetail/compounds/UniverseHealthCheckList.js b/managed/ui/src/components/universes/UniverseDetail/compounds/UniverseHealthCheckList.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { Alert, Row } from 'react-bootstrap';
 import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
-import * as moment from 'moment';
+import moment from 'moment';
 import { sortBy, values } from 'lodash';
 
 import { YBLoading } from '../../../common/indicators';
@@ -225,7 +225,7 @@ const detailsFormatter = (cell, row) => {
 function prepareData(data) {
   return data.map((timeDataJson) => {
     const timeData = JSON.parse(timeDataJson);
-    const timestampMoment = moment(timeData.timestamp);
+    const timestampMoment = moment.utc(timeData.timestamp).local();
     const nodesByIpAddress = {};
     timeData.data.forEach((check) => {
       check.key = getKeyForCheck(check);

diff --git a/managed/ui/src/components/universes/UniverseOverview/UniverseOverviewNew.js b/managed/ui/src/components/universes/UniverseOverview/UniverseOverviewNew.js
@@ -236,7 +236,7 @@ class HealthInfoPanel extends PureComponent {
     let disabledUntilStr = '';
     if (getPromiseState(healthCheck).isSuccess()) {
       const healthCheckData = JSON.parse([...healthCheck.data].reverse()[0]);
-      const lastUpdateDate = moment(healthCheckData.timestamp);
+      const lastUpdateDate = moment.utc(healthCheckData.timestamp).local();
       if (universeInfo.universeConfig && 'disableAlertsUntilSecs' in universeInfo.universeConfig) {
         const disabledUntilSecs = Number(universeInfo.universeConfig.disableAlertsUntilSecs);
         const now = Date.now() / 1000;