From 92f5f8dceda72c67618b34a1a5659a4470be2c29 Mon Sep 17 00:00:00 2001 From: timstanley1985 Date: Sat, 9 Apr 2016 17:09:55 +0100 Subject: [PATCH 1/7] Fix build on RPi. Building from source timesout on karma tests so increase timeouts --- karma.conf.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index dc082924b11..c803dda5eae 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -24,9 +24,10 @@ module.exports = function(config) { logLevel: config.LOG_INFO, autoWatch: true, browsers: ['PhantomJS'], - captureTimeout: 2000, + captureTimeout: 20000, singleRun: true, - autoWatchBatchDelay: 1000, + autoWatchBatchDelay: 10000, + browserNoActivityTimeout: 60000, }); From b6ccd7ffbef0c7b8c0bc95731fce129962e8d03b Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Tue, 12 Apr 2016 15:18:47 -0400 Subject: [PATCH 2/7] Updated background color on div --- public/sass/pages/_login.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss index 926e8c21f6c..8f376dfae71 100644 --- a/public/sass/pages/_login.scss +++ b/public/sass/pages/_login.scss @@ -134,7 +134,7 @@ border-bottom: 1px solid $gray-1; .login-divider-text { - background-color: $dark-3; + background-color: $panel-bg; color: $gray-2; padding: 0 10px; } @@ -192,4 +192,3 @@ } } } - From c13ebce2f6c20cea8e69015bf184376bd80c48f3 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Tue, 12 Apr 2016 17:01:30 -0400 Subject: [PATCH 3/7] Update module.html --- public/app/plugins/panel/pluginlist/module.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index b62dc352b00..d9a52c29ac1 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -22,7 +22,7 @@
- + No additional panels installed. Browse Grafana.net
From 10131aa8a0830d0c2e39d2fdbd0f907021930701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 12:23:29 -0400 Subject: [PATCH 4/7] fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686 --- CHANGELOG.md | 7 ++++++- pkg/api/api.go | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3579807e1df..e5d3e899e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# 3.0.0-beta3 (unreleased) +# 3.0.0-beta4 (unreleased) + +### Bug fixes +* **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) + +# 3.0.0-beta3 (2016-04-12) ### Enhancements * **InfluxDB**: Changed multi query encoding to work with InfluxDB 0.11 & 0.12, closes [#4533](https://github.com/grafana/grafana/issues/4533) diff --git a/pkg/api/api.go b/pkg/api/api.go index fae78053962..9a0e81434f3 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -191,9 +191,9 @@ func Register(r *macaron.Macaron) { r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn) - r.Group("/plugins", func() { - r.Get("/", wrap(GetPluginList)) + r.Get("/plugins", wrap(GetPluginList)) + r.Group("/plugins", func() { r.Get("/:pluginId/readme", wrap(GetPluginReadme)) r.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards)) r.Get("/:pluginId/settings", wrap(GetPluginSettingById)) From d9ad4cf2fc4927c2374de41a4a23eab55587e2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 13:03:41 -0400 Subject: [PATCH 5/7] fix(): made plugin settings api call accessable for viewer roles --- pkg/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 9a0e81434f3..684633e0bcd 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -192,11 +192,11 @@ func Register(r *macaron.Macaron) { r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn) r.Get("/plugins", wrap(GetPluginList)) + r.Get("/plugins/:pluginId/settings", wrap(GetPluginSettingById)) r.Group("/plugins", func() { r.Get("/:pluginId/readme", wrap(GetPluginReadme)) r.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards)) - r.Get("/:pluginId/settings", wrap(GetPluginSettingById)) r.Post("/:pluginId/settings", bind(m.UpdatePluginSettingCmd{}), wrap(UpdatePluginSetting)) }, reqOrgAdmin) From 7456514816c46c6d4829a2d0d66830d8bf26abd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 16:41:19 -0400 Subject: [PATCH 6/7] fix(templating): fixed issue with template variables that use regex extraction, fixes #4672 --- CHANGELOG.md | 1 + public/app/features/templating/templateValuesSrv.js | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5d3e899e30..86103f8e8c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug fixes * **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) +* **Templating**: Fixed issue templating variables that use regex extraction, fixes [#4672](https://github.com/grafana/grafana/issues/4672) # 3.0.0-beta3 (2016-04-12) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 4cd33e3db29..799e27583d5 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -281,6 +281,7 @@ function (angular, _, kbn) { if (!matches) { continue; } if (matches.length > 1) { value = matches[1]; + text = value; } } From 7302ddaba5006d1be0d35ed7dc72a1847c97f1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 16:43:00 -0400 Subject: [PATCH 7/7] docs(): fixed docs fixes #46688 --- docs/sources/http_api/data_source.md | 29 ---------------------------- 1 file changed, 29 deletions(-) diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md index 2a3c20e9af8..2a8f79f71f5 100644 --- a/docs/sources/http_api/data_source.md +++ b/docs/sources/http_api/data_source.md @@ -207,35 +207,6 @@ page_keywords: grafana, admin, http, api, documentation, datasource {"message":"Data source deleted"} -## Available data source types - -`GET /api/datasources/plugins` - -**Example Request**: - - GET /api/datasources/plugins HTTP/1.1 - Accept: application/json - Content-Type: application/json - Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk - -**Example Response**: - - HTTP/1.1 200 - Content-Type: application/json - - { - "grafana":{ - "metrics":true,"module":"plugins/datasource/grafana/datasource", - "name":"Grafana (for testing)", - "partials":{ - "query":"app/plugins/datasource/grafana/partials/query.editor.html" - }, - "pluginType":"datasource", - "serviceName":"GrafanaDatasource", - "type":"grafana" - } - } - ## Data source proxy calls `GET /api/datasources/proxy/:datasourceId/*`