From 78833b4a47a40da1fb1e0dc3693ff47226585dc7 Mon Sep 17 00:00:00 2001 From: Michael Musenbrock Date: Mon, 5 Sep 2022 16:36:52 +0200 Subject: [PATCH] Alerting: Display alert's 'Created' time in local time instead of UTC (#54414) Signed-off-by: Michael Musenbrock Signed-off-by: Michael Musenbrock --- public/app/features/alerting/unified/RuleList.test.tsx | 4 ++-- .../alerting/unified/components/rules/AlertInstancesTable.tsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx index 0a3327ccd90..1e0cdc8ffce 100644 --- a/public/app/features/alerting/unified/RuleList.test.tsx +++ b/public/app/features/alerting/unified/RuleList.test.tsx @@ -345,8 +345,8 @@ describe('RuleList', () => { const instanceRows = byTestId('row').getAll(instancesTable); expect(instanceRows).toHaveLength(2); - expect(instanceRows![0]).toHaveTextContent('Firingfoo=barseverity=warning2021-03-18 13:47:05'); - expect(instanceRows![1]).toHaveTextContent('Firingfoo=bazseverity=error2021-03-18 13:47:05'); + expect(instanceRows![0]).toHaveTextContent('Firingfoo=barseverity=warning2021-03-18 08:47:05'); + expect(instanceRows![1]).toHaveTextContent('Firingfoo=bazseverity=error2021-03-18 08:47:05'); // expand details of an instance await userEvent.click(ui.ruleCollapseToggle.get(instanceRows![0])); diff --git a/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx b/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx index b6b97381b28..22c5faf9e03 100644 --- a/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx +++ b/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx @@ -1,5 +1,6 @@ import React, { FC, useMemo } from 'react'; +import { dateTime } from '@grafana/data'; import { Alert, PaginationProps } from 'app/types/unified-alerting'; import { alertInstanceKey } from '../../utils/rules'; @@ -59,7 +60,7 @@ const columns: AlertTableColumnProps[] = [ label: 'Created', // eslint-disable-next-line react/display-name renderCell: ({ data: { activeAt } }) => ( - <>{activeAt.startsWith('0001') ? '-' : activeAt.slice(0, 19).replace('T', ' ')} + <>{activeAt.startsWith('0001') ? '-' : dateTime(activeAt).format('YYYY-MM-DD HH:mm:ss')} ), size: '150px', },