From: Kanika Murarka <kmurarka@redhat.com>
Date: Tue, 8 Jan 2019 06:45:05 +0000 (+0530)
Subject: mgr/dashboard: Fixes Grafana 500 error
X-Git-Tag: v14.1.0~470^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=609fe223d420e31463a5c77bff24496decd6351c;p=ceph.git

mgr/dashboard: Fixes Grafana 500 error

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

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 7ed2c76e9909..67875a966c34 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
@@ -65,7 +65,6 @@ export class GrafanaComponent implements OnInit, OnChanges {
         subs.unsubscribe();
       }, 0);
     });
-
     this.settingsService.ifSettingConfigured('api/grafana/url', (url) => {
       this.grafanaExist = true;
       this.loading = false;
@@ -92,17 +91,23 @@ export class GrafanaComponent implements OnInit, OnChanges {
     } else {
       this.modeText = 'Return to default';
     }
-    this.getFrame();
+    if (this.grafanaExist) {
+      this.getFrame();
+    }
     this.modeFlag = false;
   }
 
   reset() {
     this.mode = '&kiosk';
     this.modeText = 'Change time selection';
-    this.getFrame();
+    if (this.grafanaExist) {
+      this.getFrame();
+    }
   }
 
   ngOnChanges(changes) {
-    this.getFrame();
+    if (this.grafanaExist) {
+      this.getFrame();
+    }
   }
 }