From: Avan Thakkar <athakkar@redhat.com>
Date: Thu, 20 Aug 2020 09:32:33 +0000 (+0530)
Subject: mgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in... 
X-Git-Tag: v14.2.12~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0ff7807f828ebea82f656dd91094d6e50486e1b;p=ceph.git

mgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in dashboard

Fixes: https://tracker.ceph.com/issues/47049

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit f76d56c45fca71ad74c53acb09b9a78f16f83734)
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
index 1a2656e00ca3..af7158c3dbdf 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
@@ -82,10 +82,6 @@ export class GrafanaComponent implements OnInit, OnChanges {
         name: this.i18n('Yesterday'),
         value: 'from=now-1d%2Fd&to=now-1d%2Fd'
       },
-      {
-        name: this.i18n('Today'),
-        value: 'from=now%2Fd&to=now%2Fd'
-      },
       {
         name: this.i18n('Today so far'),
         value: 'from=now%2Fd&to=now'
@@ -106,10 +102,6 @@ export class GrafanaComponent implements OnInit, OnChanges {
         name: this.i18n('Previous week'),
         value: 'from=now-1w%2Fw&to=now-1w%2Fw'
       },
-      {
-        name: this.i18n('This week'),
-        value: 'from=now%2Fw&to=now%2Fw'
-      },
       {
         name: this.i18n('This week so far'),
         value: 'from=now%2Fw&to=now'
@@ -122,10 +114,6 @@ export class GrafanaComponent implements OnInit, OnChanges {
         name: this.i18n('Previous month'),
         value: 'from=now-1M%2FM&to=now-1M%2FM'
       },
-      {
-        name: this.i18n('This month'),
-        value: 'from=now%2FM&to=now%2FM'
-      },
       {
         name: this.i18n('This month so far'),
         value: 'from=now%2FM&to=now'
@@ -150,10 +138,6 @@ export class GrafanaComponent implements OnInit, OnChanges {
         name: this.i18n('Previous year'),
         value: 'from=now-1y%2Fy&to=now-1y%2Fy'
       },
-      {
-        name: this.i18n('This year'),
-        value: 'from=now%2Fy&to=now%2Fy'
-      },
       {
         name: this.i18n('This year so far'),
         value: 'from=now%2Fy&to=now'