From cf00775bb8fe45154ca6e22ad890f72b011742a6 Mon Sep 17 00:00:00 2001 From: Idan Zalzberg Date: Sun, 10 Apr 2016 11:00:25 +0700 Subject: [PATCH 1/7] Table module calls renderingCompleted --- public/app/plugins/panel/table/module.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index a6d348064eb..d9bba0576b7 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -218,6 +218,7 @@ class TablePanelCtrl extends MetricsPanelCtrl { if (data) { renderPanel(); } + ctrl.renderingCompleted(); }); } } From c100df412d40702210b6c439ae83be48f01c04cf Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Sun, 10 Apr 2016 01:30:58 -0700 Subject: [PATCH 2/7] Consistency in options for future support --- public/app/plugins/datasource/opentsdb/config_ctrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/opentsdb/config_ctrl.ts b/public/app/plugins/datasource/opentsdb/config_ctrl.ts index e4d69c40b4d..c7c90e9c17f 100644 --- a/public/app/plugins/datasource/opentsdb/config_ctrl.ts +++ b/public/app/plugins/datasource/opentsdb/config_ctrl.ts @@ -16,7 +16,7 @@ export class OpenTsConfigCtrl { tsdbVersions = [ {name: '<=2.1', value: 1}, - {name: '2.2', value: 2}, + {name: '>=2.2', value: 2}, ]; tsdbResolutions = [ From a8f4b0227f310632ef2242da1de387fe3b70d789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 10 Apr 2016 14:58:52 -0400 Subject: [PATCH 3/7] fix(graph): Fixed issue with legend height in table mode with few series, affected iframe embedding as well, fixes #4640 --- CHANGELOG.md | 2 +- public/app/core/components/switch.ts | 4 +- .../dashboard/partials/shareModal.html | 52 +++++++++---------- public/app/plugins/panel/graph/legend.js | 4 +- public/sass/components/_modals.scss | 6 +-- 5 files changed, 30 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0741e2e0ec..8e77be6b6f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ * **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626) * **InfluxDB**: Fixed issue with templating query containing template variable, fixes [#4602](https://github.com/grafana/grafana/issues/4602) * **Graph Panel**: Fixed issue with hiding series and stacking, fixes [#4557](https://github.com/grafana/grafana/issues/4557) -* **Mixed Datasources**: Fixed issue with mixing many datasources in same graph, fixes [#4604](https://github.com/grafana/grafana/issues/4604) +* **Graph Panel**: Fixed issue with legend height in table mode with few series, affected iframe embedding as well, fixes [#4640](https://github.com/grafana/grafana/issues/4640) # 3.0.0-beta2 (2016-04-04) diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts index 1dddae20d49..10211b5b914 100644 --- a/public/app/core/components/switch.ts +++ b/public/app/core/components/switch.ts @@ -21,14 +21,14 @@ export class SwitchCtrl { id: any; /** @ngInject */ - constructor($scope) { + constructor($scope, private $timeout) { this.show = true; this.id = $scope.$id; } internalOnChange() { return new Promise(resolve => { - setTimeout(() => { + this.$timeout(() => { this.onChange(); resolve(); }); diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html index 41c08fede0b..c8462c7bffc 100644 --- a/public/app/features/dashboard/partials/shareModal.html +++ b/public/app/features/dashboard/partials/shareModal.html @@ -38,31 +38,26 @@
-
-
+
+
-
-
- -
-
@@ -117,7 +113,7 @@

-