From 92f5f8dceda72c67618b34a1a5659a4470be2c29 Mon Sep 17 00:00:00 2001 From: timstanley1985 Date: Sat, 9 Apr 2016 17:09:55 +0100 Subject: [PATCH 01/39] 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 47bba71d7f7d489eff417bdddcc328c5e7448db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 10:28:32 -0400 Subject: [PATCH 02/39] fixed update check --- pkg/plugins/update_checker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go index 33ca1b2277b..36169434096 100644 --- a/pkg/plugins/update_checker.go +++ b/pkg/plugins/update_checker.go @@ -111,7 +111,7 @@ func checkForUpdates() { if strings.Contains(setting.BuildVersion, "-") { GrafanaLatestVersion = githubLatest.Testing - GrafanaHasUpdate = strings.HasPrefix(setting.BuildVersion, githubLatest.Testing) + GrafanaHasUpdate = !strings.HasPrefix(setting.BuildVersion, githubLatest.Testing) } else { GrafanaLatestVersion = githubLatest.Stable GrafanaHasUpdate = githubLatest.Stable != setting.BuildVersion From bb0eb29c82472b7e02041673b95d3132deba5983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 10:28:56 -0400 Subject: [PATCH 03/39] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index 48595c735e4..bd317e071ed 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { "stable": "2.6.0", - "testing": "3.0.0-beta2" + "testing": "3.0.0-beta3" } From 329ee8d9f1dbc02e3acd82ba5dce0045487785f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 10:50:58 -0400 Subject: [PATCH 04/39] fix(prometheus): added template variable escape format to prometheus annotations queries, fixes #4656 --- 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 acfc4b876d3..21d8c93aa94 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -157,7 +157,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS var interpolated; try { - interpolated = templateSrv.replace(expr); + interpolated = templateSrv.replace(expr, {}, interpolateQueryExpr); } catch (err) { return $q.reject(err); } From 29dff7ba1a23b16970b5aecdb2b843e4427bf0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 11:07:34 -0400 Subject: [PATCH 05/39] fix(graph): fixed color picker appearingunder pinned side nav, fixes #4556 --- public/app/core/components/colorpicker.ts | 13 ++----------- public/app/plugins/panel/graph/legend.js | 1 - .../plugins/panel/graph/series_overrides_ctrl.js | 1 + public/sass/components/_drop.scss | 1 + 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/public/app/core/components/colorpicker.ts b/public/app/core/components/colorpicker.ts index 7c35ac7e4ac..1834a1eb8a1 100644 --- a/public/app/core/components/colorpicker.ts +++ b/public/app/core/components/colorpicker.ts @@ -7,10 +7,6 @@ import coreModule from 'app/core/core_module'; var template = `
- - - -
`; @@ -51,21 +46,17 @@ export class ColorPickerCtrl { toggleAxis(yaxis) { this.$scope.toggleAxis(); - if (!this.$scope.autoClose) { + if (this.$scope.autoClose) { this.$scope.dismiss(); } } colorSelected(color) { this.$scope.colorSelected(color); - if (!this.$scope.autoClose) { + if (this.$scope.autoClose) { this.$scope.dismiss(); } } - - close() { - this.$scope.dismiss(); - } } export function colorPicker() { diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js index 5d9e1c24872..8146617bc22 100644 --- a/public/app/plugins/panel/graph/legend.js +++ b/public/app/plugins/panel/graph/legend.js @@ -49,7 +49,6 @@ function (angular, _, $) { position: 'bottom center', template: '', model: { - autoClose: true, series: series, toggleAxis: function() { ctrl.toggleAxis(series); diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.js b/public/app/plugins/panel/graph/series_overrides_ctrl.js index 7a41a650306..940da1a9e4b 100644 --- a/public/app/plugins/panel/graph/series_overrides_ctrl.js +++ b/public/app/plugins/panel/graph/series_overrides_ctrl.js @@ -59,6 +59,7 @@ define([ openOn: 'click', template: '', model: { + autoClose: true, colorSelected: $scope.colorSelected, }, onClose: function() { diff --git a/public/sass/components/_drop.scss b/public/sass/components/_drop.scss index 0af497f46f2..4045c1daa4b 100644 --- a/public/sass/components/_drop.scss +++ b/public/sass/components/_drop.scss @@ -7,6 +7,7 @@ $attachmentOffset: 0%; $easing: cubic-bezier(0, 0, 0.265, 1.00); .drop-element { + z-index: 10000; position: absolute; display: none; opacity: 0; From 7afb6fa3e3d91cd28060874a261376554d8f553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 11:20:03 -0400 Subject: [PATCH 06/39] ux(ds edit): combine save and test connection buttons, closes #4658 --- public/app/features/plugins/ds_edit_ctrl.ts | 13 ++++++++++--- public/app/features/plugins/partials/ds_edit.html | 8 ++------ public/sass/_variables.dark.scss | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index b76407a90e8..e7e8014ed10 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -16,6 +16,8 @@ var defaults = { jsonData: {} }; +var datasourceCreated = false; + export class DataSourceEditCtrl { isNew: boolean; datasources: any[]; @@ -66,6 +68,11 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; + + if (datasourceCreated) { + datasourceCreated = false; + this.testDatasource(); + } return this.typeChanged(); }); } @@ -123,14 +130,14 @@ export class DataSourceEditCtrl { if (this.current.id) { return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(() => { this.updateFrontendSettings().then(() => { - if (test) { - this.testDatasource(); - } + this.testDatasource(); }); }); } else { return this.backendSrv.post('/api/datasources', this.current).then(result => { this.updateFrontendSettings(); + + datasourceCreated = true; this.$location.path('datasources/edit/' + result.id); }); } diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 9ff82027abf..54254169b0b 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -25,7 +25,7 @@
-
+
@@ -55,7 +55,6 @@
Testing....
-
Test results
{{ctrl.testing.title}}
@@ -64,10 +63,7 @@
- - + diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index f0b55dbf381..75d7a67c547 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -27,7 +27,7 @@ $white: #fff; // ------------------------- $blue: #33B5E5; $blue-dark: #005f81; -$green: #669900; +$green: #609000; $red: #CC3900; $yellow: #ECBB13; $pink: #FF4444; From 3ab54270198f898573ed5e197f73799af9ed31e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 12:39:59 -0400 Subject: [PATCH 07/39] fix(timepicker): fixed issues and added some polish to timepicker shift back/forward buttons --- .../dashboard/timepicker/timepicker.html | 22 ++++++--------- public/app/partials/help_modal.html | 28 +++++++++---------- public/sass/components/_timepicker.scss | 12 ++++++++ 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html index 49e2dac27c0..c2a777b68d6 100644 --- a/public/app/features/dashboard/timepicker/timepicker.html +++ b/public/app/features/dashboard/timepicker/timepicker.html @@ -1,19 +1,13 @@
    -
  • - - - -
    • -
  • - - - -
    • -
  • - - Zoom Out - +
  • + +
    • +
  • + Zoom Out
    • + +
  • +
  • diff --git a/public/app/partials/help_modal.html b/public/app/partials/help_modal.html index 7ec2f39d7de..6a8c888bda3 100644 --- a/public/app/partials/help_modal.html +++ b/public/app/partials/help_modal.html @@ -29,21 +29,21 @@ Refresh (Fetches new data and rerenders panels) - < - Shift time backward - + left arrow key + Shift time backward + - > - Shift time forward - + right arrow key + Shift time forward + CTRL+S Save dashboard - - CTRL+E - Export dashboard - + + CTRL+E + Export dashboard + CTRL+H Hide row controls @@ -52,10 +52,10 @@ CTRL+Z Zoom out - - CTRL+I - Quick snapshot - + + CTRL+I + Quick snapshot + CTRL+O Enable/Disable shared graph crosshair diff --git a/public/sass/components/_timepicker.scss b/public/sass/components/_timepicker.scss index 776c69a6fac..8bfbdef4cff 100644 --- a/public/sass/components/_timepicker.scss +++ b/public/sass/components/_timepicker.scss @@ -115,3 +115,15 @@ @extend .fa; @extend .fa-chevron-left; } + +.gf-timepicker-time-control { + font-size: $font-size-sm; + a { + padding: 18px 7px 13px !important; + } +} + +.dashnav-move-timeframe { + position: relative; + top: 1px; +} From e822fad50536ae73aedfb93d4805e077e876d724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 12:41:17 -0400 Subject: [PATCH 08/39] fix(timepicker): fixed issues and added some polish to timepicker shift back/forward buttons --- public/app/features/dashboard/timepicker/timepicker.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html index c2a777b68d6..a1b4321cc80 100644 --- a/public/app/features/dashboard/timepicker/timepicker.html +++ b/public/app/features/dashboard/timepicker/timepicker.html @@ -1,12 +1,12 @@
      -
    • +
    • Zoom Out
      • -
    • +
      • From 9868edb1384c1709efb7f74c8a7ac8e7f1b19039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 13:00:33 -0400 Subject: [PATCH 09/39] ux(): changed tooltip style --- public/app/features/dashboard/unsavedChangesSrv.js | 1 - public/app/plugins/panel/pluginlist/module.html | 2 +- public/sass/_variables.dark.scss | 6 +++--- public/sass/components/_tooltip.scss | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index ffc82e198cd..d732335ade9 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -102,7 +102,6 @@ function(angular, _) { value.current = null; value.options = null; }); - }; p.hasChanges = function() { diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index 339eb1fe649..b62dc352b00 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -10,7 +10,7 @@ {{plugin.name}} v{{plugin.info.version}} - + Update available! diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 75d7a67c547..bb5fdc0b026 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -252,12 +252,12 @@ $popover-help-color: $text-color; // Tooltips and popovers // ------------------------- -$tooltipColor: $text-color; -$tooltipBackground: $dark-5; +$tooltipColor: $popover-help-color; +$tooltipBackground: $popover-help-bg; $tooltipArrowWidth: 5px; $tooltipArrowColor: $tooltipBackground; $tooltipLinkColor: $link-color; -$graph-tooltip-bg: $dark-5; +$graph-tooltip-bg: $dark-4; // images $checkboxImageUrl: '../img/checkbox.png'; diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss index 2f1408dbec1..c200bf07af8 100644 --- a/public/sass/components/_tooltip.scss +++ b/public/sass/components/_tooltip.scss @@ -26,6 +26,7 @@ text-align: center; text-decoration: none; background-color: $tooltipBackground; + border-radius: 4px; } // Arrows From 6961cb744037309803598cadd614ec5a9919c908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 13:29:31 -0400 Subject: [PATCH 10/39] ux(): reduced tooltip border radius --- public/sass/components/_tooltip.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss index c200bf07af8..f710dc68931 100644 --- a/public/sass/components/_tooltip.scss +++ b/public/sass/components/_tooltip.scss @@ -26,7 +26,7 @@ text-align: center; text-decoration: none; background-color: $tooltipBackground; - border-radius: 4px; + border-radius: 2px; } // Arrows From ad0794cc59f1c144b02cb5a922863dc2e48f4c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Apr 2016 14:26:49 -0400 Subject: [PATCH 11/39] ux(): updated light theme --- public/app/core/time_series2.ts | 2 ++ public/app/features/plugins/partials/ds_edit.html | 2 +- public/app/plugins/panel/graph/module.ts | 9 +++++---- public/sass/_variables.light.scss | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts index e0a3dd47b4e..cbceff7afd8 100644 --- a/public/app/core/time_series2.ts +++ b/public/app/core/time_series2.ts @@ -42,6 +42,7 @@ export default class TimeSeries { fillBelowTo: any; transform: any; flotpairs: any; + unit: any; constructor(opts) { this.datapoints = opts.datapoints; @@ -52,6 +53,7 @@ export default class TimeSeries { this.valueFormater = kbn.valueFormats.none; this.stats = {}; this.legend = true; + this.unit = opts.unit; } applySeriesOverrides(overrides) { diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 54254169b0b..a43a9db4345 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -34,7 +34,7 @@
The name is used when you select the data source in panels. - The Default data source is preselected in new + The Default data source is preselected in new panels. diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 748518ce92e..b626cc8d767 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -202,6 +202,7 @@ class GraphCtrl extends MetricsPanelCtrl { datapoints: datapoints, alias: alias, color: color, + unit: seriesData.unit, }); if (datapoints && datapoints.length > 0) { @@ -212,13 +213,9 @@ class GraphCtrl extends MetricsPanelCtrl { } this.datapointsCount += datapoints.length; - this.panel.tooltip.msResolution = this.panel.tooltip.msResolution || series.isMsResolutionNeeded(); } - if (seriesData.unit) { - this.panel.yaxes[series.yaxis-1].format = seriesData.unit; - } return series; } @@ -228,6 +225,10 @@ class GraphCtrl extends MetricsPanelCtrl { for (let series of this.seriesList) { series.applySeriesOverrides(this.panel.seriesOverrides); + + if (series.unit) { + this.panel.yaxes[series.yaxis-1].format = series.unit; + } } } diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index bea22947da5..e2e374b48ee 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -277,8 +277,8 @@ $popover-help-color: $gray-6; // Tooltips and popovers // ------------------------- -$tooltipColor: $text-color; -$tooltipBackground: $gray-5; +$tooltipColor: $popover-help-color; +$tooltipBackground: $popover-help-bg; $tooltipArrowWidth: 5px; $tooltipArrowColor: $tooltipBackground; $tooltipLinkColor: $link-color; From b6ccd7ffbef0c7b8c0bc95731fce129962e8d03b Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Tue, 12 Apr 2016 15:18:47 -0400 Subject: [PATCH 12/39] 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 13/39] 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 14/39] 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 15/39] 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 16/39] 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 17/39] 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/*` From e4374b1d56399cfc404ef9cd59e025d5f1962ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:33:03 -0400 Subject: [PATCH 18/39] docs(): updated download links --- build.go | 2 +- docs/sources/installation/debian.md | 6 +++--- docs/sources/installation/rpm.md | 8 ++++---- packaging/publish/publish.sh | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.go b/build.go index 93b9e6db087..a28e8870252 100644 --- a/build.go +++ b/build.go @@ -73,7 +73,7 @@ func main() { grunt("test") case "package": - grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) + // grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) createLinuxPackages() case "pkg-rpm": diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 3b720643d1a..8fa0d2cc1c3 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, debian, ubuntu, guide Description | Download ------------ | ------------- Stable .deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb) -Beta .deb for Debian-based Linux | [grafana_3.0.0-beta31460467884_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta31460467884_amd64.deb) +Beta .deb for Debian-based Linux | [grafana_3.0.0-beta41460581169_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb) ## Install Stable @@ -21,9 +21,9 @@ Beta .deb for Debian-based Linux | [grafana_3.0.0-beta31460467884_amd64.deb](h ## Install 3.0 Beta - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta31460467884_amd64.deb + $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.0.0-beta31460467884_amd64.deb + $ sudo dpkg -i grafana_3.0.0-beta41460581169_amd64.deb ## APT Repository diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 4b2d5467812..adbaa055f29 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide Description | Download ------------ | ------------- Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm) -Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta31460467884.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta31460467884§.x86_64.rpm) +Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta41460581169.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169§.x86_64.rpm) ## Install Stable Release from package file @@ -34,18 +34,18 @@ Or install manually using `rpm`. You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo rpm -Uvh grafana-3.0.0-beta41460581169.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo rpm -i --nodeps grafana-3.0.0-beta41460581169.x86_64.rpm ## Install via YUM Repository diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh index 4ab6b2f6b45..dd0c935d2cd 100755 --- a/packaging/publish/publish.sh +++ b/packaging/publish/publish.sh @@ -1,16 +1,16 @@ #! /usr/bin/env bash -deb_ver=3.0.0-beta31460467884 -rpm_ver=3.0.0-beta31460467884 +deb_ver=3.0.0-beta41460581169 +rpm_ver=3.0.0-beta41460581169 #rpm_ver=3.0.0-1 -# wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb +wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb -# package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb +package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm From 5c395424c631afe621a8954686fea446500fbe8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:42:33 -0400 Subject: [PATCH 19/39] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86103f8e8c3..2ccae3cf6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 3.0.0-beta4 (unreleased) +# 3.0.0-beta4 (2016-04-13) ### Bug fixes * **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) From 573457c03fb26b5dc3aecc80ac98003b6f205ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:48:20 -0400 Subject: [PATCH 20/39] fix(build): fixed build script issue --- build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.go b/build.go index a28e8870252..93b9e6db087 100644 --- a/build.go +++ b/build.go @@ -73,7 +73,7 @@ func main() { grunt("test") case "package": - // grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) + grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) createLinuxPackages() case "pkg-rpm": From 9469b20cbd52312d4d3d653e84921d08e041e010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 Apr 2016 08:41:54 -0400 Subject: [PATCH 21/39] fix(graph): Fixed issue with light theme text color issue in tooltip, fixes #4702 --- CHANGELOG.md | 7 ++++++- public/sass/_variables.light.scss | 2 +- public/sass/components/_panel_graph.scss | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86103f8e8c3..da82105ec29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# 3.0.0-beta4 (unreleased) +# 3.0.0-beta5 () + +### Bug fixes +* **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702) + +# 3.0.0-beta4 (2016-04-13) ### Bug fixes * **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index e2e374b48ee..4d41ca59a4a 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -281,7 +281,7 @@ $tooltipColor: $popover-help-color; $tooltipBackground: $popover-help-bg; $tooltipArrowWidth: 5px; $tooltipArrowColor: $tooltipBackground; -$tooltipLinkColor: $link-color; +$tooltipLinkColor: lighten($popover-help-color, 5%); $graph-tooltip-bg: $gray-5; // images diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss index 12215f16798..ca79034a0bd 100644 --- a/public/sass/components/_panel_graph.scss +++ b/public/sass/components/_panel_graph.scss @@ -236,6 +236,7 @@ white-space: nowrap; font-size: $font-size-sm; background-color: $graph-tooltip-bg; + color: $text-color; .graph-tooltip-time { text-align: center; @@ -248,7 +249,7 @@ display: table-row; &--highlight { - color: $link-color; + color: $text-color-emphasis; font-weight: bold; } } From 6216ce455f8f0a208a341d687f63f455bdf27dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 Apr 2016 10:55:24 -0400 Subject: [PATCH 22/39] fix(pluginlist): fixed issue with pluginlist link, fixes #4705 --- .../app/plugins/panel/pluginlist/module.html | 56 +++++++++---------- public/app/plugins/panel/pluginlist/module.ts | 6 +- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index d9a52c29ac1..c73da35b391 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -1,30 +1,30 @@
-
-
- {{category.header}} -
-
-
- - - {{plugin.name}} - v{{plugin.info.version}} - - - Update available! - - - Enable now - - - Up to date - -
-
-
- - No additional panels installed. Browse Grafana.net - -
-
+
+
+ {{category.header}} +
+
+ + + + {{plugin.name}} + v{{plugin.info.version}} + + + Update available! + + + Enable now + + + Up to date + + +
+
+ + No additional panels installed. Browse Grafana.net + +
+
diff --git a/public/app/plugins/panel/pluginlist/module.ts b/public/app/plugins/panel/pluginlist/module.ts index 9ad43b25e56..8ec86efd9c2 100644 --- a/public/app/plugins/panel/pluginlist/module.ts +++ b/public/app/plugins/panel/pluginlist/module.ts @@ -35,12 +35,14 @@ class PluginListCtrl extends PanelCtrl { this.addEditorTab('Options', 'public/app/plugins/panel/pluginlist/editor.html'); } - gotoPlugin(plugin) { - this.$location.path(`plugins/${plugin.id}/edit`); + gotoPlugin(plugin, evt) { + if (evt) { evt.stopPropagation(); } + this.$location.url(`plugins/${plugin.id}/edit`); } updateAvailable(plugin, $event) { $event.stopPropagation(); + $event.preventDefault(); var modalScope = this.$scope.$new(true); modalScope.plugin = plugin; From 635589658415995d37d20743a523efc81f082039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 Apr 2016 11:06:48 -0400 Subject: [PATCH 23/39] fix(snapshots): Fixed issue with empty snapshots, fixes #4706 --- CHANGELOG.md | 1 + public/app/features/panel/metrics_panel_ctrl.ts | 2 +- public/app/plugins/panel/graph/module.ts | 2 +- public/app/plugins/panel/singlestat/module.ts | 6 +----- public/app/plugins/panel/table/module.ts | 6 +----- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f8e2c47e09..f28fb65b492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug fixes * **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702) +* **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706) # 3.0.0-beta4 (2016-04-13) diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index df4e912211e..e8c16fd9ab7 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -65,7 +65,7 @@ class MetricsPanelCtrl extends PanelCtrl { var data = this.panel.snapshotData; // backward compatability if (!_.isArray(data)) { - data = data; + data = data.data; } this.events.emit('data-snapshot-load', data); diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index b626cc8d767..1fcd44204f7 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -161,7 +161,7 @@ class GraphCtrl extends MetricsPanelCtrl { onDataSnapshotLoad(snapshotData) { this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard); - this.onDataReceived(snapshotData.data); + this.onDataReceived(snapshotData); } onDataError(err) { diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts index cd85fda7c92..8af684c9d68 100644 --- a/public/app/plugins/panel/singlestat/module.ts +++ b/public/app/plugins/panel/singlestat/module.ts @@ -56,7 +56,7 @@ class SingleStatCtrl extends MetricsPanelCtrl { this.events.on('data-received', this.onDataReceived.bind(this)); this.events.on('data-error', this.onDataError.bind(this)); - this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this)); + this.events.on('data-snapshot-load', this.onDataReceived.bind(this)); this.events.on('init-edit-mode', this.onInitEditMode.bind(this)); } @@ -71,10 +71,6 @@ class SingleStatCtrl extends MetricsPanelCtrl { this.render(); } - onDataSnapshotLoad(snapshotData) { - this.onDataReceived(snapshotData.data); - } - onDataError(err) { this.onDataReceived({data: []}); } diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index d9bba0576b7..7a2973cc390 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -60,7 +60,7 @@ class TablePanelCtrl extends MetricsPanelCtrl { this.events.on('data-received', this.onDataReceived.bind(this)); this.events.on('data-error', this.onDataError.bind(this)); - this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this)); + this.events.on('data-snapshot-load', this.onDataReceived.bind(this)); this.events.on('init-edit-mode', this.onInitEditMode.bind(this)); this.events.on('init-panel-actions', this.onInitPanelActions.bind(this)); } @@ -86,10 +86,6 @@ class TablePanelCtrl extends MetricsPanelCtrl { return super.issueQueries(datasource); } - onDataSnapshotLoad(data) { - this.onDataReceived(data.data); - } - onDataError(err) { this.dataRaw = []; this.render(); From 8ac5c3673585efb83e88da249cdcab57770936ad Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 14 Apr 2016 11:12:00 -0400 Subject: [PATCH 24/39] Still not fixed, not sure why. despite having pushed that code with @torkelo. --- 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 c73da35b391..1aa9f7ad2eb 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 c1a5771fcd4605b891703eb2c9dbbd6421dd09dc Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 14 Apr 2016 11:38:07 -0400 Subject: [PATCH 25/39] Updated colors to fix issue --- public/sass/_variables.dark.scss | 4 +++- public/sass/_variables.light.scss | 3 ++- public/sass/base/_code.scss | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index bb5fdc0b026..560f2d2dab1 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -102,7 +102,9 @@ $tight-form-func-bg: #333; $tight-form-func-highlight-bg: #444; $modal-background: $black; -$code-tag-bg: #444; +$code-tag-bg: $dark-5; +$code-tag-border: lighten($code-tag-bg, 2%); + // Lists $grafanaListBackground: $dark-3; diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 4d41ca59a4a..a7b5c72af2b 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -109,7 +109,8 @@ $tight-form-func-bg: $gray-5; $tight-form-func-highlight-bg: $gray-6; $modal-background: $body-bg; -$code-tag-bg: $dark-5; +$code-tag-bg: $gray-6; +$code-tag-border: darken($code-tag-bg, 3%); // Lists $grafanaListBackground: $gray-6; diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss index 464eed966ce..eb085c0577c 100644 --- a/public/sass/base/_code.scss +++ b/public/sass/base/_code.scss @@ -10,7 +10,7 @@ pre { font-size: $font-size-base - 2; background-color: $code-tag-bg; color: $text-color; - border: 1px solid darken($code-tag-bg, 15%); + border: 1px solid $code-tag-border; padding: 10px; border-radius: 4px; } From d27da57b0298ac14ae943c855852c8b1487c278f Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 14 Apr 2016 12:39:37 -0400 Subject: [PATCH 26/39] Fixed the fix. --- 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 1aa9f7ad2eb..c73da35b391 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 924800b7dfaff3b00b6b53bc6c3d8cbf18f95b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 Apr 2016 14:15:47 -0400 Subject: [PATCH 27/39] bumped version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 04715d72cb0..902bda53370 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "3.0.0-beta4", + "version": "3.0.0-beta5", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git" From 75555c470b695fb196fba7256a6c7b30ecb340a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 Apr 2016 18:09:04 -0400 Subject: [PATCH 28/39] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index bd317e071ed..03b813ac7f4 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { "stable": "2.6.0", - "testing": "3.0.0-beta3" + "testing": "3.0.0-beta4" } From d98839fc197a5ae6a31bb37efbc472afb622a4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 09:01:27 -0400 Subject: [PATCH 29/39] Revert "feat(cli): detects plugin folder for dev env" This reverts commit a5eda6a87b9fbdf4b157ecd146ec4269641095c3. --- pkg/cmd/grafana-cli/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go index 6af55e6177c..5cc3fb6f306 100644 --- a/pkg/cmd/grafana-cli/main.go +++ b/pkg/cmd/grafana-cli/main.go @@ -8,6 +8,7 @@ import ( "github.com/codegangsta/cli" "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands" "github.com/grafana/grafana/pkg/cmd/grafana-cli/log" + "strings" ) var version = "master" @@ -17,7 +18,7 @@ func getGrafanaPluginDir() string { defaultNix := "/var/lib/grafana/plugins" if currentOS == "windows" { - return "..\\data\\plugins" + return "C:\\opt\\grafana\\plugins" } pwd, err := os.Getwd() @@ -28,16 +29,16 @@ func getGrafanaPluginDir() string { } if isDevenvironment(pwd) { - return "../data/plugins" + return "../../../data/plugins" } return defaultNix } func isDevenvironment(pwd string) bool { - // if ../conf/default.ini exists, grafana is not installed as package - _, err := os.Stat("../conf/default.ini") - return err != nil + // if grafana-cli is executed from the cmd folder we can assume + // that its in development environment. + return strings.HasSuffix(pwd, "/pkg/cmd/grafana-cli") } func main() { From 2e8ed97355453f71a9dc50322ee5c4dc855c609f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 09:13:06 -0400 Subject: [PATCH 30/39] changelog(grafana-cli): fixed issue with grafana-cli and plugins dir, fixes #4723 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f28fb65b492..4517547d94a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# 3.0.0-beta5 (unreleased) +# 3.0.0-beta5 (2016-04-15 ### Bug fixes +* **Grafna-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723) * **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702) * **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706) From 4832ecf3e78e66578165ab12488107fde2fc158c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 09:25:09 -0400 Subject: [PATCH 31/39] docs(): updated download links --- docs/sources/installation/debian.md | 6 +++--- docs/sources/installation/rpm.md | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 8fa0d2cc1c3..231b4a601ac 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, debian, ubuntu, guide Description | Download ------------ | ------------- Stable .deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb) -Beta .deb for Debian-based Linux | [grafana_3.0.0-beta41460581169_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb) +Beta .deb for Debian-based Linux | [grafana_3.0.0-beta51460725904_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta51460725904_amd64.deb) ## Install Stable @@ -21,9 +21,9 @@ Beta .deb for Debian-based Linux | [grafana_3.0.0-beta41460581169_amd64.deb](h ## Install 3.0 Beta - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb + $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta51460725904_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.0.0-beta41460581169_amd64.deb + $ sudo dpkg -i grafana_3.0.0-beta51460725904_amd64.deb ## APT Repository diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index adbaa055f29..d981a5c4b2c 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide Description | Download ------------ | ------------- Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm) -Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta41460581169.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169§.x86_64.rpm) +Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta51460725904.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta51460725904§.x86_64.rpm) ## Install Stable Release from package file @@ -34,18 +34,18 @@ Or install manually using `rpm`. You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta51460725904.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.0.0-beta41460581169.x86_64.rpm + $ sudo rpm -Uvh grafana-3.0.0-beta51460725904.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.0.0-beta41460581169.x86_64.rpm + $ sudo rpm -i --nodeps grafana-3.0.0-beta51460725904.x86_64.rpm ## Install via YUM Repository From 83ba6638a123449213bcf582f5e8acfe72b99c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 10:50:17 -0400 Subject: [PATCH 32/39] bumped version --- latest.json | 2 +- package.json | 2 +- packaging/publish/publish.sh | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/latest.json b/latest.json index 03b813ac7f4..9354661781a 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { "stable": "2.6.0", - "testing": "3.0.0-beta4" + "testing": "3.0.0-beta5" } diff --git a/package.json b/package.json index 902bda53370..f454a42ba7a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "3.0.0-beta5", + "version": "3.0.0-beta6", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git" diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh index dd0c935d2cd..79303707231 100755 --- a/packaging/publish/publish.sh +++ b/packaging/publish/publish.sh @@ -1,22 +1,22 @@ #! /usr/bin/env bash -deb_ver=3.0.0-beta41460581169 -rpm_ver=3.0.0-beta41460581169 +deb_ver=3.0.0-beta51460725904 +rpm_ver=3.0.0-beta51460725904 #rpm_ver=3.0.0-1 -wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb +#wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb -package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb -package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb +#package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb +#package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb -wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm +#wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm -package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm -ackage_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm +#package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm +package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm # package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm # package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm From 38bda92bdc6cc62ce0771b52c438552fc25aed7e Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 15 Apr 2016 13:26:27 -0400 Subject: [PATCH 33/39] Update dashnav.html --- public/app/features/dashboard/dashnav/dashnav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index 19112f77a43..9afd152d8aa 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -36,7 +36,7 @@
  • - +
  • From 8e37de19c9057b2807f0521dca7d049d0bfd13f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 14:36:43 -0400 Subject: [PATCH 34/39] ux(): minor fix to tooltip in template editor view --- CHANGELOG.md | 4 +- .../features/templating/partials/editor.html | 95 ++++++++++--------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4517547d94a..3b8239bd437 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ -# 3.0.0-beta5 (2016-04-15 +# 3.0.0-beta5 (2016-04-15) ### Bug fixes -* **Grafna-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723) +* **grafana-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723) * **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702) * **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706) diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index d1cab90ac9d..d8c74d1eea9 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -179,55 +179,56 @@
    Selection Options
    - - - - +
    + + + + +
    +
    + Custom all value + +
    +
    -
    - Custom all value - -
    -
    • +
    +
    Value groups/tags (Experimental feature)
    +
    + +
    +
    + Tags query + +
    +
    +
  • Tag values query
    • + +
    +
    -
    -
    Value groups/tags (Experimental feature)
    -
    - -
    -
    - Tags query - -
    -
    -
  • Tag values query
    • - -
    -
    +
    +
    Preview of values (shows max 20)
    +
    + + {{option.text}} + +
    +
    +
    -
    -
    Preview of values (shows max 20)
    -
    - - {{option.text}} - -
    -
    -
    - -
    - - -
    - +
    + + +
    + From 614b26fff6b340eb8e7272a97d0a697c15ed12e2 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 15 Apr 2016 14:58:20 -0400 Subject: [PATCH 35/39] Fixed inline code styles and increase line heights in lists to accommodate code --- public/sass/base/_code.scss | 6 ++---- public/sass/components/_panel_text.scss | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss index eb085c0577c..4222c652193 100644 --- a/public/sass/base/_code.scss +++ b/public/sass/base/_code.scss @@ -21,6 +21,8 @@ code { background-color: $code-tag-bg; border: 1px solid darken($code-tag-bg, 15%); white-space: nowrap; + padding: 2px 5px; + margin: 0 2px; } code.code--small { @@ -29,10 +31,6 @@ code.code--small { margin: 0 2px; } -p.code--line { - line-height: 1.8; -} - // Blocks of code pre { display: block; diff --git a/public/sass/components/_panel_text.scss b/public/sass/components/_panel_text.scss index 06d3495aaa0..9de31bab4c8 100644 --- a/public/sass/components/_panel_text.scss +++ b/public/sass/components/_panel_text.scss @@ -3,4 +3,5 @@ ul { margin: 0 0 $spacer $spacer * 1.5; } + li {line-height: 2;} } From 151d8db98d1c860a8f85433c7663e05f86532857 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 15 Apr 2016 15:00:29 -0400 Subject: [PATCH 36/39] removed unnecessary style --- public/app/features/plugins/partials/update_instructions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/plugins/partials/update_instructions.html b/public/app/features/plugins/partials/update_instructions.html index 80e3a413d1d..55455e24af7 100644 --- a/public/app/features/plugins/partials/update_instructions.html +++ b/public/app/features/plugins/partials/update_instructions.html @@ -16,6 +16,6 @@ 
    grafana-cli plugins update {{plugin.id}}
    Check out {{plugin.name}} on Grafana.net for README and changelog. If you do not have access to the command line, ask your Grafana administator. -

    Pro tip: To update all plugins at once, type grafana-cli plugins update-all on the command line. +

    Pro tip: To update all plugins at once, type grafana-cli plugins update-all on the command line. From 0f1606691539cbac4b27cdb89bfe3ad826199878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 18:32:03 -0400 Subject: [PATCH 37/39] fix(): zoom out tooltip fix, fixes #4729 --- public/app/features/dashboard/timepicker/timepicker.html | 2 +- public/app/features/dashboard/timepicker/timepicker.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html index a1b4321cc80..12570b3f2b0 100644 --- a/public/app/features/dashboard/timepicker/timepicker.html +++ b/public/app/features/dashboard/timepicker/timepicker.html @@ -3,7 +3,7 @@

    • -
  • +
  • Zoom Out
  • diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts index fbdff8e116a..b22ec162dd6 100644 --- a/public/app/features/dashboard/timepicker/timepicker.ts +++ b/public/app/features/dashboard/timepicker/timepicker.ts @@ -92,7 +92,7 @@ export class TimePickerCtrl { move(direction) { var range = this.timeSrv.timeRange(); - var timespan = (range.to.valueOf() - range.from.valueOf()); + var timespan = (range.to.valueOf() - range.from.valueOf()) / 2; var to, from; if (direction === -1) { to = range.to.valueOf() - timespan; From 4f2628c22150c7ef73e7585aaf6f39c3d49ab155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 18:50:48 -0400 Subject: [PATCH 38/39] fix(): fixed issue with templating preview, fixes #4714 --- public/app/features/templating/partials/editor.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index d8c74d1eea9..c7dfe61f2b4 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -217,10 +217,10 @@
    Preview of values (shows max 20)
    -
    - - {{option.text}} - +
    +
    + {{option.text}} +
    From e307ada3744beddfac253f163110bb6a4c71db9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Apr 2016 19:56:39 -0400 Subject: [PATCH 39/39] ux(): tooltip improvement --- .../app/core/components/dashboard_selector.ts | 3 + public/app/core/components/info_popover.ts | 23 +++++--- public/app/core/components/switch.ts | 23 ++------ .../features/dashboard/partials/settings.html | 11 ++-- public/app/features/org/prefs_control.ts | 7 +-- .../features/plugins/partials/ds_edit.html | 12 ++-- .../plugins/partials/ds_http_settings.html | 55 ++++++++++--------- .../cloudwatch/partials/config.html | 29 ++++++---- public/sass/components/_gf-form.scss | 28 ++++++++++ 9 files changed, 116 insertions(+), 75 deletions(-) diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts index 913a43911fa..4209ff3f8dc 100644 --- a/public/app/core/components/dashboard_selector.ts +++ b/public/app/core/components/dashboard_selector.ts @@ -7,6 +7,9 @@ import coreModule from 'app/core/core_module'; var template = ` + + Not finding dashboard you want? Star it first, then it should appear in this select box. + `; export class DashboardSelectorCtrl { diff --git a/public/app/core/components/info_popover.ts b/public/app/core/components/info_popover.ts index cc49ecbc4ab..8bc28b8a57d 100644 --- a/public/app/core/components/info_popover.ts +++ b/public/app/core/components/info_popover.ts @@ -8,21 +8,30 @@ import Drop from 'tether-drop'; export function infoPopover() { return { restrict: 'E', + template: '', transclude: true, link: function(scope, elem, attrs, ctrl, transclude) { - var inputElem = elem.prev(); - if (inputElem.length === 0) { - console.log('Failed to find input element for popover'); - return; - } + // var inputElem = elem.prev(); + // if (inputElem.length === 0) { + // console.log('Failed to find input element for popover'); + // return; + // } var offset = attrs.offset || '0 -10px'; var position = attrs.position || 'right middle'; var classes = 'drop-help drop-hide-out-of-bounds'; + var openOn = 'hover'; + + elem.addClass('gf-form-help-icon'); + if (attrs.wide) { classes += ' drop-wide'; } + if (attrs.mode) { + elem.addClass('gf-form-help-icon--' + attrs.mode); + } + transclude(function(clone, newScope) { var content = document.createElement("div"); _.each(clone, (node) => { @@ -30,11 +39,11 @@ export function infoPopover() { }); var drop = new Drop({ - target: inputElem[0], + target: elem[0], content: content, position: position, classes: classes, - openOn: 'click', + openOn: openOn, tetherOptions: { offset: offset } diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts index e2ba60d92e8..2a64ec487f7 100644 --- a/public/app/core/components/switch.ts +++ b/public/app/core/components/switch.ts @@ -7,7 +7,12 @@ import coreModule from 'app/core/core_module'; import Drop from 'tether-drop'; var template = ` - +
    @@ -49,22 +54,6 @@ export function switchDirective() { onChange: "&", }, template: template, - link: (scope, elem) => { - if (scope.ctrl.tooltip) { - var drop = new Drop({ - target: elem[0], - content: scope.ctrl.tooltip, - position: "right middle", - classes: 'drop-help', - openOn: 'hover', - hoverOpenDelay: 400, - }); - - scope.$on('$destroy', function() { - drop.destroy(); - }); - } - } }; } diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index 2a2287613ae..8d071d90495 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -26,7 +26,10 @@
    - +
    @@ -46,19 +49,19 @@ label="Editable" tooltip="Uncheck, then save and reload to disable all dashboard editing" checked="dashboard.editable" - label-class="width-10"> + label-class="width-11"> + label-class="width-11"> + label-class="width-11"> diff --git a/public/app/features/org/prefs_control.ts b/public/app/features/org/prefs_control.ts index 53704d5e390..fab51ad02b8 100644 --- a/public/app/features/org/prefs_control.ts +++ b/public/app/features/org/prefs_control.ts @@ -49,7 +49,7 @@ export class PrefsControlCtrl { } var template = ` - +

    Preferences

    @@ -61,9 +61,8 @@ var template = `
    Home Dashboard - +
    diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index a43a9db4345..6ad0c40fa68 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -31,18 +31,18 @@
    Name + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. +
    - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. -
    Type -
    +
    diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html index 404918f90d4..08d2af5744a 100644 --- a/public/app/features/plugins/partials/ds_http_settings.html +++ b/public/app/features/plugins/partials/ds_http_settings.html @@ -3,29 +3,34 @@

    Http settings

    -
    - Url - - - -

    Specify a complete HTTP url (for example http://your_server:8080)

    - - Your access method is Direct, this means the url - needs to be accessable from the browser. - - - Your access method is currently Proxy, this means the url - needs to be accessable from the grafana backend. - -     +
    +
    + Url + + +

    Specify a complete HTTP url (for example http://your_server:8080)

    + + Your access method is Direct, this means the url + needs to be accessable from the browser. + + + Your access method is currently Proxy, this means the url + needs to be accessable from the grafana backend. + +     +
    -
    - - Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request - -
    - +
    +
    + Access +
    + + + Direct = url is used directly from browser
    + Proxy = Grafana backend will proxy the request +     +
    @@ -34,12 +39,12 @@
    + label="Basic Auth" + checked="current.basicAuth" switch-class="max-width-6"> + label="With Credentials" + checked="current.withCredentials" switch-class="max-width-6">
    diff --git a/public/app/plugins/datasource/cloudwatch/partials/config.html b/public/app/plugins/datasource/cloudwatch/partials/config.html index 5f999c58a42..ede6baaa525 100644 --- a/public/app/plugins/datasource/cloudwatch/partials/config.html +++ b/public/app/plugins/datasource/cloudwatch/partials/config.html @@ -1,22 +1,27 @@

    CloudWatch details

    -
    +
    - - + + + + Credentials profile name, as specified in ~/.aws/credentials, leave blank for default +
    - -
    - + +
    + + + Specify the region, such as for US West (Oregon) use ` us-west-2 ` as the region. +
    - - + + + + Namespaces of Custom Metrics +
    diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 12e1fd2f32f..66dab450ee1 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -6,6 +6,7 @@ $gf-form-margin: 0.25rem; flex-direction: row; align-items: center; text-align: left; + position: relative; .cr1 { margin-left: 8px; @@ -138,6 +139,12 @@ $gf-form-margin: 0.25rem; content: '\f0d7'; pointer-events: none; } + + &--has-help-icon { + &:after { + right: $input-padding-x*3; + } + } } .gf-form--v-stretch { @@ -182,3 +189,24 @@ $gf-form-margin: 0.25rem; pointer-events: none; } } + +.gf-form-help-icon { + flex-grow: 0; + padding-left: $spacer; + color: $text-color-weak; + + &--right-absolute { + position: absolute; + right: $spacer; + top: 8px; + } + + &--right-normal { + float: right; + } +} + +select.gf-form-input ~ .gf-form-help-icon { + right: 10px; +} +