From b9a2546a107a6fbbeee23c3d5165c9a2f62201a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 18 Jul 2016 15:41:06 +0200
Subject: [PATCH 1/3] fix(iframe): fixed issue with using full height of
 iframe, fixes #5605

---
 public/app/features/dashboard/viewStateSrv.js | 17 +++++++++++------
 public/app/features/panel/solo_panel_ctrl.js  |  7 ++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
index 035bfb6ae6e..2ea365c3b49 100644
--- a/public/app/features/dashboard/viewStateSrv.js
+++ b/public/app/features/dashboard/viewStateSrv.js
@@ -107,9 +107,12 @@ function (angular, _, $) {
       this.dashboard.meta.fullscreen = this.state.fullscreen;
 
       if (!this.state.fullscreen) {
-        this.state.panelId = null;
         this.state.fullscreen = null;
         this.state.edit = null;
+        // clear panel id unless in solo mode
+        if (!this.dashboard.meta.soloMode) {
+          this.state.panelId = null;
+        }
       }
 
       $location.search(this.serializeToUrl());
@@ -193,11 +196,13 @@ function (angular, _, $) {
       var self = this;
       self.panelScopes.push(panelScope);
 
-      if (self.state.panelId === panelScope.ctrl.panel.id) {
-        if (self.state.edit) {
-          panelScope.ctrl.editPanel();
-        } else {
-          panelScope.ctrl.viewPanel();
+      if (!self.dashboard.meta.soloMode) {
+        if (self.state.panelId === panelScope.ctrl.panel.id) {
+          if (self.state.edit) {
+            panelScope.ctrl.editPanel();
+          } else {
+            panelScope.ctrl.viewPanel();
+          }
         }
       }
 
diff --git a/public/app/features/panel/solo_panel_ctrl.js b/public/app/features/panel/solo_panel_ctrl.js
index 0eb271675ee..de299d7f9fe 100644
--- a/public/app/features/panel/solo_panel_ctrl.js
+++ b/public/app/features/panel/solo_panel_ctrl.js
@@ -17,15 +17,12 @@ function (angular, $) {
       var params = $location.search();
       panelId = parseInt(params.panelId);
 
-      // add fullscreen param;
-      params.fullscreen = true;
-      $location.search(params);
+      $scope.onAppEvent("dashboard-initialized", $scope.initPanelScope);
 
       dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) {
+        result.meta.soloMode = true;
         $scope.initDashboard(result, $scope);
       });
-
-      $scope.onAppEvent("dashboard-initialized", $scope.initPanelScope);
     };
 
     $scope.initPanelScope = function() {

From 575b015fe022b14d200ab56717158843e108f7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 18 Jul 2016 16:13:50 +0200
Subject: [PATCH 2/3] fix(panel rendering): Fixed png panel rendering timing
 issue, #5606

---
 public/app/core/profiler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
index 6505cd0405f..eb05672ec2c 100644
--- a/public/app/core/profiler.ts
+++ b/public/app/core/profiler.ts
@@ -101,7 +101,7 @@ export class Profiler {
   renderingCompleted(panelId, panelTimings) {
     // add render counter to root scope
     // used by phantomjs render.js to know when panel has rendered
-    this.$rootScope.panelsRendered = this.panelsRendered++;
+    this.$rootScope.panelsRendered = this.panelsRendered + 1;
 
     if (this.enabled) {
       panelTimings.renderEnd = new Date().getTime();

From 3ae327320a904b4423d0b7b5f86eeb697f8fdaa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 18 Jul 2016 16:27:02 +0200
Subject: [PATCH 3/3] fix(prometheus): fixed svg link in prometheus dashboard,
 fixes #5604

---
 .../datasource/prometheus/dashboards/prometheus_stats.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
index e008317a96e..0c2e0e85728 100644
--- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
+++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
@@ -167,7 +167,7 @@
           "valueName": "current"
         },
         {
-          "content": "<img src=\"http://prometheus.io/assets/prometheus_logo_grey.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"http://www.grafana.org/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
+          "content": "<img src=\"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"http://www.grafana.org/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
           "editable": true,
           "error": false,
           "id": 9,