From 9b84b8851810c181f588bb5b92690696ca999809 Mon Sep 17 00:00:00 2001 From: Lucas Costa Date: Thu, 28 Apr 2016 19:23:45 -0300 Subject: [PATCH 01/20] Add support to Elasticsearch precision_threshold --- public/app/plugins/datasource/elasticsearch/metric_agg.js | 5 +++++ .../datasource/elasticsearch/partials/metric_agg.html | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js index 7fb227ab5b5..ecf4e16378e 100644 --- a/public/app/plugins/datasource/elasticsearch/metric_agg.js +++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js @@ -68,6 +68,11 @@ function (angular, _, queryDef) { } switch($scope.agg.type) { + case 'cardinality': { + var precision_threshold = $scope.agg.settings.precision_threshold || ''; + $scope.settingsLinkText = 'Precision threshold: ' + precision_threshold; + break; + } case 'percentiles': { $scope.agg.settings.percents = $scope.agg.settings.percents || [25,50,75,95,99]; $scope.settingsLinkText = 'Values: ' + $scope.agg.settings.percents.join(','); diff --git a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html index 24582baf8d1..faa12b5693d 100644 --- a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html +++ b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html @@ -58,6 +58,11 @@ +
+ + +
+
From eb35f8cb8900a6ef0c25c497423fcf4c2b23c81c Mon Sep 17 00:00:00 2001 From: stuart nelson Date: Thu, 30 Jun 2016 11:29:02 +0200 Subject: [PATCH 02/20] [prometheus] Use `panelId` and `target.refId` for requestId Using these two values ties requests to a particular query position within a panel, ensuring that requests are canceled if: - Duplicate requests with the same query are sent - Requests from the same query position (but a different query) are sent The last point is important as it identifies queries by a physical location in the dashboard instead of with the query expression. If a different query from the same position in a panel is sent, the previous request should be canceled. --- public/app/plugins/datasource/prometheus/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 4284ce78e8f..cbde594b6b1 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -77,7 +77,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS var query: any = {}; query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr); - query.requestId = target.expr; + query.requestId = options.panelId + target.refId; var interval = target.interval || options.interval; var intervalFactor = target.intervalFactor || 1; From 81af8f072cf8c2324bba06cd85f3774fec11aea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Jul 2016 19:07:16 +0200 Subject: [PATCH 03/20] feat(links): updated links to grafana.net --- public/app/core/components/search/search.html | 4 +- .../plugins/partials/plugin_list.html | 66 ++++++++++--------- public/img/grafana_net_logo.svg | 1 + public/sass/components/_search.scss | 17 ++++- public/sass/pages/_plugins.scss | 39 ++++------- 5 files changed, 68 insertions(+), 59 deletions(-) create mode 100644 public/img/grafana_net_logo.svg diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index b66eeffdc36..e8e2179ce5c 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -72,8 +72,8 @@ Import - - Explore ready made dashboards on Grafana.net + + Find dashboards on
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html index f4ee2b57815..c276faae93a 100644 --- a/public/app/features/plugins/partials/plugin_list.html +++ b/public/app/features/plugins/partials/plugin_list.html @@ -5,9 +5,9 @@

Plugins

- - Explore plugins on Grafana.net - + + +
    @@ -27,36 +27,40 @@
-
-
-
+ + Find plugins on + +
+ + +
-
    -
  1. - -
    -
    - - {{plugin.type}} -
    -
    - Update available! -
    -
    -
    -
    - -
    -
    -
    {{plugin.name}}
    -
    By {{plugin.info.author.name}}
    -
    -
    -     -
    2. -
-
+
    +
  1. + +
    +
    + + {{plugin.type}} +
    +
    + Update available! +
    +
    +
    +
    + +
    +
    +
    {{plugin.name}}
    +
    By {{plugin.info.author.name}}
    +
    +
    +     +
    2. +
+ diff --git a/public/img/grafana_net_logo.svg b/public/img/grafana_net_logo.svg new file mode 100644 index 00000000000..d73b9b944a8 --- /dev/null +++ b/public/img/grafana_net_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index ad48b29f512..563f89919e5 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -101,9 +101,24 @@ .search-button-row { padding-top: 20px; - line-height: 2.5rem; + button, a { margin-right: 10px; } + + .search-button-row-explore-link { + color: $text-muted; + font-size: $font-size-sm; + padding-right: 7rem; + background: url(../img/grafana_net_logo.svg); + background-size: 6.5rem 3rem; + background-repeat: no-repeat; + background-position: right; + position: relative; + top: 0.8rem; + &:hover { + color: $link-hover-color; + } + } } diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss index 970d048cce3..f473a52ec94 100644 --- a/public/sass/pages/_plugins.scss +++ b/public/sass/pages/_plugins.scss @@ -63,28 +63,17 @@ } } -// .app-edit-logo-box { -// padding: 1.2rem; -// background: $panel-bg; -// text-align: center; -// img { -// max-width: 7rem; -// } -// margin-right: 2rem; -// } -// -// .app-edit-links { -// list-style: none; -// margin: 0 0 0 2rem; -// -// li { -// background: $panel-bg; -// margin-top: 4px; -// padding: 0.2rem 1rem; -// } -// } -// -// .app-edit-description { -// font-style: italic; -// margin-bottom: 1.5rem; -// } +.get-more-plugins-link { + color: $text-muted; + font-size: $font-size-sm; + padding-right: 7rem; + background: url(../img/grafana_net_logo.svg); + background-size: 6.5rem 3rem; + background-repeat: no-repeat; + background-position: right; + position: relative; + top: 1.2rem; + &:hover { + color: $link-hover-color; + } +} From f3db2fa262f818d43878ac623d31b2219aa09de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Jul 2016 19:16:35 +0200 Subject: [PATCH 04/20] feat(plugins): hide link on small screens --- public/sass/pages/_plugins.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss index f473a52ec94..ed4d39d316f 100644 --- a/public/sass/pages/_plugins.scss +++ b/public/sass/pages/_plugins.scss @@ -77,3 +77,9 @@ color: $link-hover-color; } } + +@include media-breakpoint-down(sm) { + .get-more-plugins-link { + display: none; + } +} From b2acac3a41fbef7bd6bb918849cbfc2ddf5dbba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 08:41:56 +0200 Subject: [PATCH 05/20] feat(apps): more polish on app dashboard save warning, #5529 --- pkg/api/dashboard.go | 4 ++-- public/app/core/services/alert_srv.ts | 2 ++ public/app/features/dashboard/dashnav/dashnav.ts | 8 ++++++-- public/app/partials/confirm_modal.html | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index a6bf96da876..041f2a7f8cf 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -139,10 +139,10 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { return Json(412, util.DynMap{"status": "version-mismatch", "message": err.Error()}) } if pluginErr, ok := err.(m.UpdatePluginDashboardError); ok { - message := "Dashboard is belongs to plugin " + pluginErr.PluginId + "." + message := "The dashboard belongs to plugin " + pluginErr.PluginId + "." // look up plugin name if pluginDef, exist := plugins.Plugins[pluginErr.PluginId]; exist { - message = "Dashboard is belongs to plugin " + pluginDef.Name + "." + message = "The dashboard belongs to plugin " + pluginDef.Name + "." } return Json(412, util.DynMap{"status": "plugin-dashboard", "message": message}) } diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts index 3003e59c74b..edfff2e8d00 100644 --- a/public/app/core/services/alert_srv.ts +++ b/public/app/core/services/alert_srv.ts @@ -73,6 +73,8 @@ export class AlertSrv { scope.text = payload.text; scope.text2 = payload.text2; scope.onConfirm = payload.onConfirm; + scope.onAltAction = payload.onAltAction; + scope.altActionText = payload.altActionText; scope.icon = payload.icon || "fa-check"; scope.yesText = payload.yesText || "Yes"; scope.noText = payload.noText || "Cancel"; diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 601be4d7eea..7d25e352e9e 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -141,9 +141,13 @@ export class DashNavCtrl { $scope.appEvent('confirm-modal', { title: 'Plugin Dashboard', text: err.data.message, - text2: 'Your changes will be overwritten next time you update the plugin. Use Save As to create custom version.', - yesText: "Save & Overwrite", + text2: 'Your changes will be lost when you update the plugin. Use Save As to create custom version.', + yesText: "Overwrite", icon: "fa-warning", + altActionText: "Save As", + onAltAction: function() { + $scope.saveDashboardAs(); + }, onConfirm: function() { $scope.saveDashboard({overwrite: true}); } diff --git a/public/app/partials/confirm_modal.html b/public/app/partials/confirm_modal.html index d9da8bdacc4..6ab4a6b32c5 100644 --- a/public/app/partials/confirm_modal.html +++ b/public/app/partials/confirm_modal.html @@ -1,4 +1,4 @@ -
+

@@ -24,6 +24,7 @@
+

From d007363e7cdd11e8ce0d7592ec44a4ad2bd73503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 08:42:28 +0200 Subject: [PATCH 06/20] bumbped version from beta1 to stable --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 16f4d854a5c..ba12e20c020 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "3.1.0-beta1", + "version": "3.1.0", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git" From 6c2a61001abd099a499eeb39ec330a5df359991d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 13:19:20 +0200 Subject: [PATCH 07/20] docs(): updated download links --- docs/sources/installation/debian.md | 13 +++---------- docs/sources/installation/rpm.md | 26 ++++---------------------- docs/sources/installation/windows.md | 2 +- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index f87ba3f045a..42acacf8228 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -10,20 +10,13 @@ page_keywords: grafana, installation, debian, ubuntu, guide Description | Download ------------ | ------------- -Stable .deb for Debian-based Linux | [3.0.4](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.4-1464167696_amd64.deb) -Beta .deb for Debian-based Linux | [3.1.0-beta1](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1466666977beta1_amd64.deb) +Stable .deb for Debian-based Linux | [3.1.0](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb) ## Install Stable - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.4-1464167696_amd64.deb + $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.0.4-1464167696_amd64.deb - -## Install 3.1 beta - - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1466666977beta1_amd64.deb - $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.1.0-1466666977beta1_amd64.deb + $ sudo dpkg -i grafana_3.1.0-1468321182_amd64.deb ## APT Repository diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 0e423eb0af4..c08521a7538 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -10,42 +10,24 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide Description | Download ------------ | ------------- -Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [3.0.4 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.4-1464167696.x86_64.rpm) -Beta .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [3.1.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1466666977beta1.x86_64.rpm) +Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [3.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1468321182.x86_64.rpm) ## Install Latest Stable You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.4-1464167696.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1468321182.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.0.4-1464167696.x86_64.rpm + $ sudo rpm -Uvh grafana-3.1.0-1468321182.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.0.4-1464167696.x86_64.rpm - -## Install 3.1 Beta - -You can install Grafana using Yum directly. - - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1466666977beta1.x86_64.rpm - -Or install manually using `rpm`. - -#### On CentOS / Fedora / Redhat: - - $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1466666977beta1.x86_64.rpm - -#### On OpenSuse: - - $ sudo rpm -i --nodeps https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1466666977beta1.x86_64.rpm + $ sudo rpm -i --nodeps grafana-3.1.0-1468321182.x86_64.rpm ## Install via YUM Repository diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 858f8cfea2d..88c92d2ffed 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide Description | Download ------------ | ------------- -Stable Zip package for Windows | [grafana.3.0.4.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.0.4.windows-x64.zip) +Stable Zip package for Windows | [grafana.3.1.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.1.0.windows-x64.zip) ## Configure From 0f9f903e09c0ba2098d73a5016ab39f7ee123329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 15:16:46 +0200 Subject: [PATCH 08/20] Update latest.json --- latest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latest.json b/latest.json index e18c220a7b0..f27001ccc41 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "stable": "3.0.4", - "testing": "3.1.0-beta1" + "stable": "3.1.0", + "testing": "3.1.0" } From 383b3130278fd1f6428f0b9eb1b03fe12164d378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 15:17:04 +0200 Subject: [PATCH 09/20] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 917d9b7fda8..1a66686fea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * **Localization**: Week start day now dependant on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003) * **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021) -# 3.1.0 stable (unreleased) +# 3.1.0 stable (2016-07-12) ### Bugfixes & Enhancements, * **User Alert Notices**: Backend error alert popups did not show properly, fixes [#5435](https://github.com/grafana/grafana/issues/5435) From 82eebf64b6b8f62a52398c067ef31ec93c28c309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Jul 2016 10:02:53 +0200 Subject: [PATCH 10/20] fix(graph): Fix so that zoom works even when no data exists, fixes #5570 --- public/vendor/flot/jquery.flot.selection.js | 35 +++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/public/vendor/flot/jquery.flot.selection.js b/public/vendor/flot/jquery.flot.selection.js index f8fa668ff4f..b7993d92ee3 100644 --- a/public/vendor/flot/jquery.flot.selection.js +++ b/public/vendor/flot/jquery.flot.selection.js @@ -94,11 +94,11 @@ The plugin allso adds the following methods to the plot object: var savedhandlers = {}; var mouseUpHandler = null; - + function onMouseMove(e) { if (selection.active) { updateSelection(e); - + plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]); } } @@ -106,7 +106,7 @@ The plugin allso adds the following methods to the plot object: function onMouseDown(e) { if (e.which != 1) // only accept left-click return; - + // cancel out any text selections document.body.focus(); @@ -127,13 +127,13 @@ The plugin allso adds the following methods to the plot object: // this is a bit silly, but we have to use a closure to be // able to whack the same handler again mouseUpHandler = function (e) { onMouseUp(e); }; - + $(document).one("mouseup", mouseUpHandler); } function onMouseUp(e) { mouseUpHandler = null; - + // revert drag stuff for old-school browsers if (document.onselectstart !== undefined) document.onselectstart = savedhandlers.onselectstart; @@ -158,13 +158,22 @@ The plugin allso adds the following methods to the plot object: function getSelection() { if (!selectionIsSane()) return null; - + if (!selection.show) return null; var r = {}, c1 = selection.first, c2 = selection.second; - $.each(plot.getAxes(), function (name, axis) { - if (axis.used) { - var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]); + var axes = plot.getAxes(); + // look if no axis is used + var noAxisInUse = true; + $.each(axes, function (name, axis) { + if (axis.used) { + anyUsed = false; + } + }) + + $.each(axes, function (name, axis) { + if (axis.used || noAxisInUse) { + var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]); r[name] = { from: Math.min(p1, p2), to: Math.max(p1, p2) }; } }); @@ -252,10 +261,10 @@ The plugin allso adds the following methods to the plot object: from = to; to = tmp; } - + return { from: from, to: to, axis: axis }; } - + function setSelection(ranges, preventEvent) { var axis, range, o = plot.getOptions(); @@ -333,11 +342,11 @@ The plugin allso adds the following methods to the plot object: ctx.restore(); } }); - + plot.hooks.shutdown.push(function (plot, eventHolder) { eventHolder.unbind("mousemove", onMouseMove); eventHolder.unbind("mousedown", onMouseDown); - + if (mouseUpHandler) $(document).unbind("mouseup", mouseUpHandler); }); From 2c77f2231e612e8d329a52161b41192b0e6b289c Mon Sep 17 00:00:00 2001 From: Jack Meagher Date: Thu, 14 Jul 2016 04:29:22 -0400 Subject: [PATCH 11/20] Do not substitute #[A-Z] in graphite target when invalid ref (#5581) * Do not substitute #[A-Z] in graphite target when invalid ref In the case where #[A-Z] does not reference another query, such as #J when there are only 2 queries, do not perform the substitution. This prevents the situation target name without a query labelled J (10th query). * Do not substitute #[A-Z] in graphite target when invalid ref In the case where #[A-Z] does not reference another query, such as #J when there are only 2 queries, do not perform the substitution. This prevents the situation target name without a query labelled J (10th query). --- public/app/plugins/datasource/graphite/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index efb107e3b16..84084a0609a 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -228,7 +228,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv } function nestedSeriesRegexReplacer(match, g1) { - return targets[g1]; + return targets[g1] || match; } for (i = 0; i < options.targets.length; i++) { From 51940fa209962948f5d0008fe07070c4034bcd6c Mon Sep 17 00:00:00 2001 From: Loren West Date: Mon, 18 Jul 2016 00:04:06 -0700 Subject: [PATCH 12/20] Tooltip detatch too soon on mobile click (#5598) * Tooltip detatch too soon on mobile click * Fixed syntax error --- public/app/plugins/panel/singlestat/module.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts index 380af96da54..8247b2cd690 100644 --- a/public/app/plugins/panel/singlestat/module.ts +++ b/public/app/plugins/panel/singlestat/module.ts @@ -538,7 +538,9 @@ class SingleStatCtrl extends MetricsPanelCtrl { elem.mouseleave(function() { if (panel.links.length === 0) { return;} - drilldownTooltip.detach(); + $timeout(function() { + drilldownTooltip.detach(); + }); }); elem.click(function(evt) { From c82d5f86ac739db96e5aa10635f0217462775da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 11:24:21 +0200 Subject: [PATCH 13/20] fix(singlestat): fixed minor editor blur issue on decimal option that did not cause update of rendered value, fixes #5004 --- public/app/plugins/panel/singlestat/editor.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/panel/singlestat/editor.html b/public/app/plugins/panel/singlestat/editor.html index bfe55003741..e6be9f83032 100644 --- a/public/app/plugins/panel/singlestat/editor.html +++ b/public/app/plugins/panel/singlestat/editor.html @@ -67,12 +67,10 @@ dropdown-typeahead="ctrl.unitFormats" dropdown-typeahead-on-select="ctrl.setUnitFormat($subItem)"> -
  • - Decimals -
    • +
  • Decimals
  • + ng-model="ctrl.panel.decimals" ng-change="ctrl.refresh()" ng-model-onblur>
    • From 8f8ee28e6430b57e01aa29ab9593c2cfd59921f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 14:06:31 +0200 Subject: [PATCH 14/20] docs(): updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a66686fea5..3ead9a12704 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * **SingleStat**: Add seriename as option in singlestat panel, closes [#4740](https://github.com/grafana/grafana/issues/4740) * **Localization**: Week start day now dependant on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003) * **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021) +* **Elasticsearch**: Support to set Precision Threshold for Unique Count metric, closes [#4689](https://github.com/grafana/grafana/issues/4689) # 3.1.0 stable (2016-07-12) From e507bb6dd7a75a9f09a7371c5519dad65de3eb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 15:41:06 +0200 Subject: [PATCH 15/20] 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 ffd865c7cadcd5b219089910f5bd90e53a34c53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 16:13:50 +0200 Subject: [PATCH 16/20] 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 b9c4107361050e07d23552352cfa158bd5526102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 16:16:35 +0200 Subject: [PATCH 17/20] docs(): updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a66686fea5..adc3b9fe902 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ * **Localization**: Week start day now dependant on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003) * **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021) +# 3.1.1 (unreleased / v3.1.x branch) +* **IFrame embedding**: Fixed issue of using full iframe height, fixes [#5605](https://github.com/grafana/grafana/issues/5606) +* **Panel PNG rendering**: Fixed issue detecting render completion, fixes [#5605](https://github.com/grafana/grafana/issues/5606) + # 3.1.0 stable (2016-07-12) ### Bugfixes & Enhancements, From b9a2546a107a6fbbeee23c3d5165c9a2f62201a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 Jul 2016 15:41:06 +0200 Subject: [PATCH 18/20] 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?= Date: Mon, 18 Jul 2016 16:13:50 +0200 Subject: [PATCH 19/20] 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?= Date: Mon, 18 Jul 2016 16:27:02 +0200 Subject: [PATCH 20/20] 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": "\"Prometheus\nPrometheus\n\n

    You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Grafana and Prometheus projects.

    ", + "content": "\"Prometheus\nPrometheus\n\n

    You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Grafana and Prometheus projects.

    ", "editable": true, "error": false, "id": 9,