From e097fb1166c3f1dafbdb871a8f4209b5ce2fec2c Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 29 Apr 2019 14:37:52 +0200 Subject: [PATCH 1/6] phantomjs: set web-security to true (cherry picked from commit f7c8d90d1af87f5d9f6c8f14503b5125c3667629) --- pkg/services/rendering/phantomjs.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/services/rendering/phantomjs.go b/pkg/services/rendering/phantomjs.go index 29c2f39fd77..35389fe7918 100644 --- a/pkg/services/rendering/phantomjs.go +++ b/pkg/services/rendering/phantomjs.go @@ -42,7 +42,8 @@ func (rs *RenderingService) renderViaPhantomJS(ctx context.Context, opts Opts) ( cmdArgs := []string{ "--ignore-ssl-errors=true", - "--web-security=false", + "--web-security=true", + "--local-url-access=false", phantomDebugArg, scriptPath, fmt.Sprintf("url=%v", url), From c9e67140cc645304266a10958c6711c65b4d5478 Mon Sep 17 00:00:00 2001 From: Utkarsh Bhatnagar Date: Wed, 24 Apr 2019 01:00:02 -0700 Subject: [PATCH 2/6] CloudWatch: Use default alias if there is no alias for metrics (#16732) Fixes #16605 (cherry picked from commit 89a01a680c5772a363dd624c0e4e49ebf397f862) --- pkg/tsdb/cloudwatch/cloudwatch.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go index 6d68e6902e5..f6d023ce14c 100644 --- a/pkg/tsdb/cloudwatch/cloudwatch.go +++ b/pkg/tsdb/cloudwatch/cloudwatch.go @@ -546,6 +546,10 @@ func formatAlias(query *CloudWatchQuery, stat string, dimensions map[string]stri return in }) + if string(result) == "" { + return metricName + "_" + stat + } + return string(result) } From 02222a753a4e76d789e889e5eb4777244096d9af Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 24 Apr 2019 10:10:16 +0200 Subject: [PATCH 3/6] playlist: fix loading dashboards by tag (#16727) Fixes #16704 (cherry picked from commit 7dadebb3f0f82d419ff1303d96b4be4332d194df) --- pkg/api/playlist_play.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go index 2757f245060..21c91a1288d 100644 --- a/pkg/api/playlist_play.go +++ b/pkg/api/playlist_play.go @@ -55,7 +55,7 @@ func populateDashboardsByTag(orgID int64, signedInUser *m.SignedInUser, dashboar Slug: item.Slug, Title: item.Title, Uri: item.Uri, - Url: m.GetDashboardUrl(item.Uid, item.Slug), + Url: item.Url, Order: dashboardTagOrder[tag], }) } From 62bd94949b2c2a20492a2bc0eca9e6d8354cad1c Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 29 Apr 2019 14:53:20 +0200 Subject: [PATCH 4/6] security: bump jquery version to 3.4.0 --- package.json | 2 +- packages/grafana-ui/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 39ba1507870..1e4b25d899d 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "eventemitter3": "^2.0.3", "file-saver": "^1.3.3", "immutable": "^3.8.2", - "jquery": "^3.2.1", + "jquery": "3.4.0", "lodash": "^4.17.10", "moment": "^2.22.2", "mousetrap": "^1.6.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 1543dd6cc34..d779ff2f4ee 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -22,7 +22,7 @@ "@types/react-color": "^2.14.0", "classnames": "^2.2.5", "d3": "^5.7.0", - "jquery": "^3.2.1", + "jquery": "3.4.0", "lodash": "^4.17.10", "moment": "^2.22.2", "papaparse": "^4.6.3", From b658b3e13e7c65fad0889977846b515ef5af4ef8 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 29 Apr 2019 15:06:32 +0200 Subject: [PATCH 5/6] bump version to 6.1.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e4b25d899d..9d2c6971471 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "company": "Grafana Labs" }, "name": "grafana", - "version": "6.1.4", + "version": "6.1.6", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git" From 44c5c0e0a67f1e3ac70608f6c8f55c56375a4279 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 29 Apr 2019 15:10:48 +0200 Subject: [PATCH 6/6] Revert "CloudWatch: Use default alias if there is no alias for metrics (#16732)" This reverts commit c9e67140cc645304266a10958c6711c65b4d5478. --- pkg/tsdb/cloudwatch/cloudwatch.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go index f6d023ce14c..6d68e6902e5 100644 --- a/pkg/tsdb/cloudwatch/cloudwatch.go +++ b/pkg/tsdb/cloudwatch/cloudwatch.go @@ -546,10 +546,6 @@ func formatAlias(query *CloudWatchQuery, stat string, dimensions map[string]stri return in }) - if string(result) == "" { - return metricName + "_" + stat - } - return string(result) }