From c8ead22722a66bb447d811fb8c9d6f65d68c6dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 Dec 2017 21:04:48 +0100 Subject: [PATCH 01/89] started on dashboard settings refactor --- public/app/core/directives/dash_class.js | 4 ++ public/app/core/directives/dash_edit_link.js | 1 - public/app/features/dashboard/all.ts | 4 +- .../app/features/dashboard/dashnav/dashnav.ts | 2 - .../features/dashboard/settings/settings.html | 27 +++++++++++ .../features/dashboard/settings/settings.ts | 47 +++++++++++++++++++ .../features/dashboard/submenu/submenu.html | 1 - public/app/partials/dashboard.html | 6 +-- 8 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 public/app/features/dashboard/settings/settings.html create mode 100644 public/app/features/dashboard/settings/settings.ts diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js index d8ad335de5c..b7323ea0161 100644 --- a/public/app/core/directives/dash_class.js +++ b/public/app/core/directives/dash_class.js @@ -34,6 +34,10 @@ function (_, $, coreModule) { $scope.$watch('ctrl.playlistSrv.isPlaying', function(newValue) { elem.toggleClass('playlist-active', newValue === true); }); + + $scope.$watch('ctrl.dashboardViewState.state.editView', function(newValue) { + elem.toggleClass('dashboard-settings-open', _.isString(newValue)); + }); } }; }); diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js index 02c7d55b99e..f0dc6f59a6a 100644 --- a/public/app/core/directives/dash_edit_link.js +++ b/public/app/core/directives/dash_edit_link.js @@ -13,7 +13,6 @@ function ($, angular, coreModule, _) { 'templating': { src: 'public/app/features/templating/partials/editor.html'}, 'history': { html: ''}, 'timepicker': { src: 'public/app/features/dashboard/timepicker/dropdown.html' }, - 'add-panel': { html: '' }, 'import': { html: '', isModal: true }, 'permissions': { html: '', isModal: true }, 'new-folder': { diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts index b4f1f4e77f0..ec99fcf098a 100644 --- a/public/app/features/dashboard/all.ts +++ b/public/app/features/dashboard/all.ts @@ -27,8 +27,8 @@ import './acl/acl'; import './folder_picker/picker'; import './folder_modal/folder'; import './move_to_folder_modal/move_to_folder'; +import './settings/settings'; + import coreModule from 'app/core/core_module'; - import {DashboardListCtrl} from './dashboard_list_ctrl'; - coreModule.controller('DashboardListCtrl', DashboardListCtrl); diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 6985d27be5f..57f75b1388d 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import moment from 'moment'; import angular from 'angular'; diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html new file mode 100644 index 00000000000..b2371960a26 --- /dev/null +++ b/public/app/features/dashboard/settings/settings.html @@ -0,0 +1,27 @@ +

Settings

+ +
+ + +
+ general +
+ +
+ annotations +
+ +
+ annotations +
+ +
+ diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts new file mode 100644 index 00000000000..28065fb5916 --- /dev/null +++ b/public/app/features/dashboard/settings/settings.ts @@ -0,0 +1,47 @@ +import {coreModule, appEvents} from 'app/core/core'; +import {DashboardModel} from '../dashboard_model'; + +export class SettingsCtrl { + dashboard: DashboardModel; + isOpen: boolean; + viewId: string; + + sections: any[] = [ + {title: 'General', id: 'general'}, + {title: 'Annotations', id: 'annotations'}, + {title: 'Templating', id: 'templating'}, + {title: 'Versions', id: 'versions'}, + ]; + + /** @ngInject */ + constructor($scope, private $location, private $rootScope) { + appEvents.on('hide-dash-editor', this.hideSettings.bind(this), $scope); + + var urlParams = this.$location.search(); + this.viewId = urlParams.editview; + } + + hideSettings() { + var urlParams = this.$location.search(); + delete urlParams.editview; + setTimeout(() => { + this.$rootScope.$apply(() => { + this.$location.search(urlParams); + }); + }); + } +} + +export function dashboardSettings() { + return { + restrict: 'E', + templateUrl: 'public/app/features/dashboard/settings/settings.html', + controller: SettingsCtrl, + bindToController: true, + controllerAs: 'ctrl', + transclude: true, + scope: { dashboard: "=" } + }; +} + +coreModule.directive('dashboardSettings', dashboardSettings); diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/submenu/submenu.html index 9e9d22fb495..f240a86efba 100644 --- a/public/app/features/dashboard/submenu/submenu.html +++ b/public/app/features/dashboard/submenu/submenu.html @@ -1,5 +1,4 @@
-
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 57f75b1388d..f291913323a 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -37,8 +37,8 @@ export class DashNavCtrl { this.contextSrv.toggleSideMenu(); } - openEditView(editview) { - var search = _.extend(this.$location.search(), {editview: editview}); + openSettings() { + var search = _.extend(this.$location.search(), {editview: 'general'}); this.$location.search(search); } diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index b2371960a26..0781b0c109d 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -1,7 +1,11 @@ -

Settings

-
+
+

+ General +

+ +
+
+ + +
+
+ + +
+
+ + + +
+ + + + +
+ + + +
Panel Options
+
+ +
+ +
+
-
- annotationus +
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 18775e5fd29..c013e9d4720 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -10,7 +10,6 @@ export class SettingsCtrl { sections: any[] = [ {title: 'General', id: 'settings', icon: "fa fa-fw fa-sliders"}, - {title: 'Timepicker', id: 'timepicker', icon: "fa fa-fw fa-clock-o"}, {title: 'Annotations', id: 'annotations', icon: "fa fa-fw fa-comment-o"}, {title: 'Templating', id: 'templating', icon: "fa fa-fw fa-dollar"}, {title: 'Links', id: 'links', icon: "fa fa-fw fa-external-link"}, diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/timepicker/settings.html index 8c40121eaed..3cb8ca061fb 100644 --- a/public/app/features/dashboard/timepicker/settings.html +++ b/public/app/features/dashboard/timepicker/settings.html @@ -1,14 +1,24 @@
+
Time Options
+
-
- Auto-refresh - -
-
- Now delay now- - -
- -
+
+ +
+ +
+
+ +
+ Auto-refresh + +
+
+ Now delay now- + +
+ + +
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 5a9fe04c625..72f82f43a8f 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -1,325 +1,293 @@ +

Templating

+
-
-

- Templating -

+
+
+ No template variables defined +

+
+ + + + + + + + + + + + - + + + + + + +
VariableDefinition
+ + ${{variable.name}} + + + {{variable.query}} + + + Duplicate + + + + + +
+
- -
+
+
+
What does templating do?
+

Templating allows for more interactive and dynamic dashboards. Instead of hard-coding things like server, application + and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of + the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. +
+
-

+ Checkout the Templating documentation for more information. +

+
+
-
-
- No template variables defined -

+
+
+   New +
+
+ + +
Variable
+
+
+
+ Name + +
+
+ + Type + + {{variableTypes[current.type].description}} + + +
+ +
+
- - - - - - - - - - - - - - - - - - -
VariableDefinition
- - ${{variable.name}} - - - {{variable.query}} - - - Duplicate - - - - - -
-
+
+ Template names cannot begin with '__' that's reserved for Grafanas global variables +
-
-
-
What does templating do?
-

Templating allows for more interactive and dynamic dashboards. Instead of hard-coding things like server, application - and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of - the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. -
-
- - Checkout the Templating documentation for more information. -

+
+
+ Label + +
+
+ Hide +
+ +
+
-
-
-   New -
-
+
+
Interval Options
- -
Variable
-
-
-
- Name - -
-
- - Type - - {{variableTypes[current.type].description}} - - -
- -
-
-
+
+ Values + +
-
- Template names cannot begin with '__' that's reserved for Grafanas global variables -
+
+ + -
-
- Label - -
-
- Hide -
- -
-
-
-
+
+ + Step count How many times should the current time range be divided to calculate the value + +
+ +
+
+
+ + Min interval The calculated value will not go below this threshold + + +
+
+
-
-
Interval Options
+
+
Custom Options
+
+ Values separated by comma + +
+
-
- Values - -
+
+
Constant options
+
+ Value + +
+
-
- - +
+
Query Options
-
- - Step count How many times should the current time range be divided to calculate the value - -
- -
-
-
- - Min interval The calculated value will not go below this threshold - - -
-
-
+
+
+ Data source +
+ +
+
+
+ + Refresh + + When to update the values of this variable. + + +
+ +
+
+
+
+ Query + +
+
+ + Regex + + Optional, if you want to extract part of a series name or metric node segment. + + + +
+
+ + Sort + + How to sort the values of this variable. + + +
+ +
+
+
-
-
Custom Options
-
- Values separated by comma - -
-
+
+
Data source options
-
-
Constant options
-
- Value - -
-
+
+ +
+ +
+
-
-
Query Options
+
+
+ + + +
+
-
-
Data source options
+
+
Options
+
+ Data source +
+ +
+
+
-
- -
- -
-
+
+
Selection Options
+
+ + + + +
+
+ Custom all value + +
+
-
- - -
-
+
+
Preview of values (shows max 20)
+
+
+ {{option.text}} +
+
+
-
-
Options
-
- Data source -
- -
-
-
+
+ {{infoText}} +
-
-
Selection Options
-
- - - - -
-
- Custom all value - -
-
+
+ + +
-
-
Value groups/tags (Experimental feature)
- - -
- Tags query - -
-
-
  • Tag values query
    • - -
    -
    - -
    -
    Preview of values (shows max 20)
    -
    -
    - {{option.text}} -
    -
    -
    - -
    - {{infoText}} -
    - -
    - - -
    - - -
    +
    diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss index 669078c7f91..bb22e6af89e 100644 --- a/public/sass/components/_dashboard_settings.scss +++ b/public/sass/components/_dashboard_settings.scss @@ -38,6 +38,13 @@ margin-bottom: 20px; padding-right: 60px; white-space: nowrap; + + i { + font-size: 25px; + position: relative; + top: 1px; + padding-right: 5px; + } } .dashboard-settings__header { diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 4f9b8fbbf4f..7cde09b1dac 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -87,20 +87,6 @@ } } -.navbar-page-btn-wrapper { - display: inline-block; - position: relative; -} - -.navbar-section-wrapper { - position: relative; - float: left; -} - -.navbar-mini-btn-wrapper { - padding: 15px; -} - .navbar-buttons { height: $navbarHeight; display: flex; diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss index 2e6ecde35da..e528891547a 100644 --- a/public/sass/components/_view_states.scss +++ b/public/sass/components/_view_states.scss @@ -1,19 +1,5 @@ -@mixin hide-controls() { - .add-row-panel-hint, - .dash-row-menu-container { - display: none; - } - .panel-drop-zone { - visibility: hidden; - } -} - -.hide-controls { - @include hide-controls(); -} .page-kiosk-mode { - @include hide-controls(); dashnav { display: none; } From 8dcfa18761d9eddc9b50aed680506ef1b35008e8 Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Sun, 10 Dec 2017 10:45:41 -0500 Subject: [PATCH 48/89] simplify function parameter addition --- .../datasource/graphite/graphite_query.ts | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts index c97cf725459..3b29c57b808 100644 --- a/public/app/plugins/datasource/graphite/graphite_query.ts +++ b/public/app/plugins/datasource/graphite/graphite_query.ts @@ -46,7 +46,7 @@ export default class GraphiteQuery { } try { - this.parseTargetRecursive(astNode, null, 0); + this.parseTargetRecursive(astNode, null); } catch (err) { console.log('error parsing target:', err.message); this.error = err.message; @@ -75,7 +75,7 @@ export default class GraphiteQuery { }, ""); } - parseTargetRecursive(astNode, func, index) { + parseTargetRecursive(astNode, func) { if (astNode === null) { return null; } @@ -83,8 +83,8 @@ export default class GraphiteQuery { switch (astNode.type) { case 'function': var innerFunc = gfunc.createFuncInstance(astNode.name, { withDefaultParams: false }); - _.each(astNode.params, (param, index) => { - this.parseTargetRecursive(param, innerFunc, index); + _.each(astNode.params, param => { + this.parseTargetRecursive(param, innerFunc); }); innerFunc.updateText(); @@ -92,7 +92,7 @@ export default class GraphiteQuery { break; case 'series-ref': if (this.segments.length > 0) { - this.addFunctionParameter(func, astNode.value, index, true); + this.addFunctionParameter(func, astNode.value); } else { this.segments.push(astNode); } @@ -100,12 +100,11 @@ export default class GraphiteQuery { case 'bool': case 'string': case 'number': - var shiftBack = this.isShiftParamsBack(func); - this.addFunctionParameter(func, astNode.value, index, shiftBack); + this.addFunctionParameter(func, astNode.value); break; case 'metric': if (this.segments.length > 0) { - this.addFunctionParameter(func, _.join(_.map(astNode.segments, 'value'), '.'), index, true); + this.addFunctionParameter(func, _.join(_.map(astNode.segments, 'value'), '.')); } else { this.segments = astNode.segments; } @@ -113,10 +112,6 @@ export default class GraphiteQuery { } } - isShiftParamsBack(func) { - return func.def.name !== 'seriesByTag'; - } - updateSegmentValue(segment, index) { this.segments[index].value = segment.value; } @@ -143,14 +138,11 @@ export default class GraphiteQuery { } } - addFunctionParameter(func, value, index, shiftBack) { - if (shiftBack) { - index = Math.max(index - 1, 0); - } - if (index > func.def.params.length) { + addFunctionParameter(func, value) { + if (func.params.length >= func.def.params.length) { throw { message: 'too many parameters for function ' + func.def.name }; } - func.params[index] = value; + func.params.push(value); } removeFunction(func) { From 525ae4fdf5a1986401a775ea2f3641ec7cc8f39e Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Sun, 10 Dec 2017 10:46:31 -0500 Subject: [PATCH 49/89] support metric trees of varying depth, never send '.select metric' to graphite --- public/app/plugins/datasource/graphite/graphite_query.ts | 2 +- public/app/plugins/datasource/graphite/query_ctrl.ts | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts index 3b29c57b808..54504219dad 100644 --- a/public/app/plugins/datasource/graphite/graphite_query.ts +++ b/public/app/plugins/datasource/graphite/graphite_query.ts @@ -152,7 +152,7 @@ export default class GraphiteQuery { updateModelTarget(targets) { // render query if (!this.target.textEditor) { - var metricPath = this.getSegmentPathUpTo(this.segments.length); + var metricPath = this.getSegmentPathUpTo(this.segments.length).replace(/\.select metric$/, ''); this.target.target = _.reduce(this.functions, wrapFunction, metricPath); } diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts index f5daf01f7cc..d00ac90fe65 100644 --- a/public/app/plugins/datasource/graphite/query_ctrl.ts +++ b/public/app/plugins/datasource/graphite/query_ctrl.ts @@ -219,10 +219,7 @@ export class GraphiteQueryCtrl extends QueryCtrl { this.updateModelTarget(); if (this.queryModel.target !== oldTarget) { - var lastSegment = this.segments.length > 0 ? this.segments[this.segments.length - 1] : {}; - if (lastSegment.value !== 'select metric') { - this.panelCtrl.refresh(); - } + this.panelCtrl.refresh(); } } From e6bdccbb05bf9b0b8e8224796ee3bc75f3beb874 Mon Sep 17 00:00:00 2001 From: noakup Date: Sun, 10 Dec 2017 18:38:48 +0200 Subject: [PATCH 50/89] hyphenhyphen --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aefc0c0802b..5358cd3f3d5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you have any problems please read the [troubleshooting guide](http://docs.gra Be sure to read the [getting started guide](http://docs.grafana.org/guides/gettingstarted/) and the other feature guides. ## Run from master -If you want to build a package yourself, or contribute. Here is a guide for how to do that. You can always find +If you want to build a package yourself, or contribute - Here is a guide for how to do that. You can always find the latest master builds [here](https://grafana.com/grafana/download) ### Dependencies @@ -97,7 +97,7 @@ Writing & watching frontend tests (we have two test runners) ## Contribute -If you have any idea for an improvement or found a bug do not hesitate to open an issue. +If you have any idea for an improvement or found a bug, do not hesitate to open an issue. And if you have time clone this repo and submit a pull request and help me make Grafana the kickass metrics & devops dashboard we all dream about! From 588ce6606c4c0a3873539b713ba2ec2fd3b05e79 Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Sun, 10 Dec 2017 21:20:38 -0500 Subject: [PATCH 51/89] fix function re-ordering broken in #9436 --- public/app/plugins/datasource/graphite/func_editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/graphite/func_editor.js b/public/app/plugins/datasource/graphite/func_editor.js index 57cdc844375..534b0886fff 100644 --- a/public/app/plugins/datasource/graphite/func_editor.js +++ b/public/app/plugins/datasource/graphite/func_editor.js @@ -208,7 +208,7 @@ function (angular, _, $) { if ($target.hasClass('fa-arrow-left')) { $scope.$apply(function() { - _.move(ctrl.functions, $scope.$index, $scope.$index - 1); + _.move(ctrl.queryModel.functions, $scope.$index, $scope.$index - 1); ctrl.targetChanged(); }); return; @@ -216,7 +216,7 @@ function (angular, _, $) { if ($target.hasClass('fa-arrow-right')) { $scope.$apply(function() { - _.move(ctrl.functions, $scope.$index, $scope.$index + 1); + _.move(ctrl.queryModel.functions, $scope.$index, $scope.$index + 1); ctrl.targetChanged(); }); return; From f7ed24475cf32a77388620544062d380c74d206d Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 8 Dec 2017 14:11:48 +0100 Subject: [PATCH 52/89] wait for all sub routines to finish simple solution for waiting for all go sub routines to finish before closing Grafana. We would use errGroup here as well but I dont like spreading context's all over the place. closes #10131 --- pkg/api/http_server.go | 2 +- pkg/cmd/grafana-server/main.go | 33 ++++++++++++++++++------- pkg/cmd/grafana-server/server.go | 42 ++++++++++++-------------------- pkg/models/server.go | 6 ----- 4 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 pkg/models/server.go diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index 89456d20d8c..0366b9aedad 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -95,7 +95,7 @@ func (hs *HttpServer) Start(ctx context.Context) error { func (hs *HttpServer) Shutdown(ctx context.Context) error { err := hs.httpSrv.Shutdown(ctx) - hs.log.Info("stopped http server") + hs.log.Info("Stopped HTTP server") return err } diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go index 183e4b047cd..edf827ac4ad 100644 --- a/pkg/cmd/grafana-server/main.go +++ b/pkg/cmd/grafana-server/main.go @@ -14,8 +14,8 @@ import ( "net/http" _ "net/http/pprof" + "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/metrics" - "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" _ "github.com/grafana/grafana/pkg/services/alerting/conditions" @@ -40,9 +40,6 @@ var homePath = flag.String("homepath", "", "path to grafana install/home path, d var pidFile = flag.String("pidfile", "", "path to pid file") var exitChan = make(chan int) -func init() { -} - func main() { v := flag.Bool("v", false, "prints current version and exits") profile := flag.Bool("profile", false, "Turn on pprof profiling") @@ -82,12 +79,28 @@ func main() { setting.BuildStamp = buildstampInt64 metrics.M_Grafana_Version.WithLabelValues(version).Set(1) - + shutdownCompleted := make(chan int) server := NewGrafanaServer() - server.Start() + + go listenToSystemSignals(server, shutdownCompleted) + + go func() { + code := 0 + if err := server.Start(); err != nil { + log.Error2("Startup failed", "error", err) + code = 1 + } + + exitChan <- code + }() + + code := <-shutdownCompleted + log.Info2("Grafana shutdown completed.", "code", code) + log.Close() + os.Exit(code) } -func listenToSystemSignals(server models.GrafanaServer) { +func listenToSystemSignals(server *GrafanaServerImpl, shutdownCompleted chan int) { signalChan := make(chan os.Signal, 1) ignoreChan := make(chan os.Signal, 1) code := 0 @@ -97,10 +110,12 @@ func listenToSystemSignals(server models.GrafanaServer) { select { case sig := <-signalChan: - // Stops trace if profiling has been enabled - trace.Stop() + trace.Stop() // Stops trace if profiling has been enabled server.Shutdown(0, fmt.Sprintf("system signal: %s", sig)) + shutdownCompleted <- 0 case code = <-exitChan: + trace.Stop() // Stops trace if profiling has been enabled server.Shutdown(code, "startup error") + shutdownCompleted <- code } } diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go index 820295a9b88..b84c3d4e3d6 100644 --- a/pkg/cmd/grafana-server/server.go +++ b/pkg/cmd/grafana-server/server.go @@ -11,7 +11,6 @@ import ( "strconv" "time" - "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" "github.com/grafana/grafana/pkg/services/provisioning" "golang.org/x/sync/errgroup" @@ -20,7 +19,6 @@ import ( "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/login" "github.com/grafana/grafana/pkg/metrics" - "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/cleanup" @@ -33,7 +31,7 @@ import ( "github.com/grafana/grafana/pkg/tracing" ) -func NewGrafanaServer() models.GrafanaServer { +func NewGrafanaServer() *GrafanaServerImpl { rootCtx, shutdownFn := context.WithCancel(context.Background()) childRoutines, childCtx := errgroup.WithContext(rootCtx) @@ -54,9 +52,7 @@ type GrafanaServerImpl struct { httpServer *api.HttpServer } -func (g *GrafanaServerImpl) Start() { - go listenToSystemSignals(g) - +func (g *GrafanaServerImpl) Start() error { g.initLogging() g.writePIDFile() @@ -69,16 +65,12 @@ func (g *GrafanaServerImpl) Start() { plugins.Init() if err := provisioning.Init(g.context, setting.HomePath, setting.Cfg); err != nil { - logger.Error("Failed to provision Grafana from config", "error", err) - g.Shutdown(1, "Startup failed") - return + return fmt.Errorf("Failed to provision Grafana from config. error: %v", err) } closer, err := tracing.Init(setting.Cfg) if err != nil { - g.log.Error("Tracing settings is not valid", "error", err) - g.Shutdown(1, "Startup failed") - return + return fmt.Errorf("Tracing settings is not valid. error: %v", err) } defer closer.Close() @@ -93,13 +85,12 @@ func (g *GrafanaServerImpl) Start() { g.childRoutines.Go(func() error { return cleanUpService.Run(g.context) }) if err = notifications.Init(); err != nil { - g.log.Error("Notification service failed to initialize", "error", err) - g.Shutdown(1, "Startup failed") - return + return fmt.Errorf("Notification service failed to initialize. error: %v", err) } - SendSystemdNotification("READY=1") - g.startHttpServer() + sendSystemdNotification("READY=1") + + return g.startHttpServer() } func initSql() { @@ -123,16 +114,16 @@ func (g *GrafanaServerImpl) initLogging() { setting.LogConfigurationInfo() } -func (g *GrafanaServerImpl) startHttpServer() { +func (g *GrafanaServerImpl) startHttpServer() error { g.httpServer = api.NewHttpServer() err := g.httpServer.Start(g.context) if err != nil { - g.log.Error("Fail to start server", "error", err) - g.Shutdown(1, "Startup failed") - return + return fmt.Errorf("Fail to start server. error: %v", err) } + + return nil } func (g *GrafanaServerImpl) Shutdown(code int, reason string) { @@ -145,10 +136,9 @@ func (g *GrafanaServerImpl) Shutdown(code int, reason string) { g.shutdownFn() err = g.childRoutines.Wait() - - g.log.Info("Shutdown completed", "reason", err) - log.Close() - os.Exit(code) + if err != nil && err != context.Canceled { + g.log.Error("Server shutdown completed with an error", "error", err) + } } func (g *GrafanaServerImpl) writePIDFile() { @@ -173,7 +163,7 @@ func (g *GrafanaServerImpl) writePIDFile() { g.log.Info("Writing PID file", "path", *pidFile, "pid", pid) } -func SendSystemdNotification(state string) error { +func sendSystemdNotification(state string) error { notifySocket := os.Getenv("NOTIFY_SOCKET") if notifySocket == "" { diff --git a/pkg/models/server.go b/pkg/models/server.go deleted file mode 100644 index 4d683835256..00000000000 --- a/pkg/models/server.go +++ /dev/null @@ -1,6 +0,0 @@ -package models - -type GrafanaServer interface { - Start() - Shutdown(code int, reason string) -} From ad2a69bff4e8dfd3933b339783d1da15ce30c1fb Mon Sep 17 00:00:00 2001 From: jomenxiao Date: Mon, 11 Dec 2017 16:01:17 +0800 Subject: [PATCH 53/89] add encoding param --- pkg/api/render.go | 1 + pkg/components/renderer/renderer.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pkg/api/render.go b/pkg/api/render.go index cab9c81505d..e9bce5bc99b 100644 --- a/pkg/api/render.go +++ b/pkg/api/render.go @@ -24,6 +24,7 @@ func RenderToPng(c *middleware.Context) { OrgId: c.OrgId, Timeout: queryReader.Get("timeout", "60"), Timezone: queryReader.Get("tz", ""), + Encoding: queryReader.Get("encoding", ""), } pngPath, err := renderer.RenderToPng(renderOpts) diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index d5980231f0e..fedb68f2e31 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -27,6 +27,7 @@ type RenderOpts struct { Timeout string OrgId int64 Timezone string + Encoding string } var ErrTimeout = errors.New("Timeout error. You can set timeout in seconds with &timeout url parameter") @@ -95,6 +96,10 @@ func RenderToPng(params *RenderOpts) (string, error) { "renderKey=" + renderKey, } + if params.Encoding != "" { + cmdArgs = append([]string{fmt.Sprintf("--output-encoding=%s", params.Encoding)}, cmdArgs...) + } + cmd := exec.Command(binPath, cmdArgs...) stdout, err := cmd.StdoutPipe() From 8e7166b5c4a77c52d68dc0c01adc67eeb8b2a54c Mon Sep 17 00:00:00 2001 From: Mikael Olenfalk Date: Mon, 11 Dec 2017 09:37:27 +0100 Subject: [PATCH 54/89] Explicitly specify default region in CloudWatch datasource (#9440) The datasource uses the default region in the query if the region is "" in the settings. However setting the region to an empty string is almost impossible and rendered incorrectly. This commit introduces a special value "default" for region which is shown in the drop down and is translated to the default region of the data source when performing queries. --- .../features/datasources/cloudwatch.md | 5 +- pkg/tsdb/cloudwatch/credentials.go | 5 ++ .../datasource/cloudwatch/datasource.js | 21 ++++-- .../cloudwatch/query_parameter_ctrl.ts | 8 ++- .../cloudwatch/specs/datasource_specs.ts | 69 +++++++++++++++++++ 5 files changed, 98 insertions(+), 10 deletions(-) diff --git a/docs/sources/features/datasources/cloudwatch.md b/docs/sources/features/datasources/cloudwatch.md index bdf661dc4fc..648957ed96e 100644 --- a/docs/sources/features/datasources/cloudwatch.md +++ b/docs/sources/features/datasources/cloudwatch.md @@ -78,11 +78,14 @@ CloudWatch Datasource Plugin provides the following queries you can specify in t edit view. They allow you to fill a variable's options list with things like `region`, `namespaces`, `metric names` and `dimension keys/values`. +In place of `region` you can specify `default` to use the default region configured in the datasource for the query, +e.g. `metrics(AWS/DynamoDB, default)` or `dimension_values(default, ..., ..., ...)`. + Name | Description ------- | -------- *regions()* | Returns a list of regions AWS provides their service. *namespaces()* | Returns a list of namespaces CloudWatch support. -*metrics(namespace, [region])* | Returns a list of metrics in the namespace. (specify region for custom metrics) +*metrics(namespace, [region])* | Returns a list of metrics in the namespace. (specify region or use "default" for custom metrics) *dimension_keys(namespace)* | Returns a list of dimension keys in the namespace. *dimension_values(region, namespace, metric, dimension_key)* | Returns a list of dimension values matching the specified `region`, `namespace`, `metric` and `dimension_key`. *ebs_volume_ids(region, instance_id)* | Returns a list of volume ids matching the specified `region`, `instance_id`. diff --git a/pkg/tsdb/cloudwatch/credentials.go b/pkg/tsdb/cloudwatch/credentials.go index 784f3b729ac..0c142bd4ea0 100644 --- a/pkg/tsdb/cloudwatch/credentials.go +++ b/pkg/tsdb/cloudwatch/credentials.go @@ -141,6 +141,11 @@ func ec2RoleProvider(sess *session.Session) credentials.Provider { } func (e *CloudWatchExecutor) getDsInfo(region string) *DatasourceInfo { + defaultRegion := e.DataSource.JsonData.Get("defaultRegion").MustString() + if region == "default" { + region = defaultRegion + } + authType := e.DataSource.JsonData.Get("authType").MustString() assumeRoleArn := e.DataSource.JsonData.Get("assumeRoleArn").MustString() accessKey := "" diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js index ac4573ef43a..b0d37fd2186 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.js +++ b/public/app/plugins/datasource/cloudwatch/datasource.js @@ -39,7 +39,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { !!item.metricName && !_.isEmpty(item.statistics); }).map(function (item) { - item.region = templateSrv.replace(item.region, options.scopedVars); + item.region = templateSrv.replace(self.getActualRegion(item.region), options.scopedVars); item.namespace = templateSrv.replace(item.namespace, options.scopedVars); item.metricName = templateSrv.replace(item.metricName, options.scopedVars); item.dimensions = self.convertDimensionFormat(item.dimensions, options.scopeVars); @@ -165,21 +165,21 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { this.getMetrics = function (namespace, region) { return this.doMetricQueryRequest('metrics', { - region: templateSrv.replace(region), + region: templateSrv.replace(this.getActualRegion(region)), namespace: templateSrv.replace(namespace) }); }; this.getDimensionKeys = function(namespace, region) { return this.doMetricQueryRequest('dimension_keys', { - region: templateSrv.replace(region), + region: templateSrv.replace(this.getActualRegion(region)), namespace: templateSrv.replace(namespace) }); }; this.getDimensionValues = function(region, namespace, metricName, dimensionKey, filterDimensions) { return this.doMetricQueryRequest('dimension_values', { - region: templateSrv.replace(region), + region: templateSrv.replace(this.getActualRegion(region)), namespace: templateSrv.replace(namespace), metricName: templateSrv.replace(metricName), dimensionKey: templateSrv.replace(dimensionKey), @@ -189,14 +189,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { this.getEbsVolumeIds = function(region, instanceId) { return this.doMetricQueryRequest('ebs_volume_ids', { - region: templateSrv.replace(region), + region: templateSrv.replace(this.getActualRegion(region)), instanceId: templateSrv.replace(instanceId) }); }; this.getEc2InstanceAttribute = function(region, attributeName, filters) { return this.doMetricQueryRequest('ec2_instance_attribute', { - region: templateSrv.replace(region), + region: templateSrv.replace(this.getActualRegion(region)), attributeName: templateSrv.replace(attributeName), filters: filters }); @@ -267,7 +267,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { period = parseInt(period, 10); var parameters = { prefixMatching: annotation.prefixMatching, - region: templateSrv.replace(annotation.region), + region: templateSrv.replace(this.getActualRegion(annotation.region)), namespace: templateSrv.replace(annotation.namespace), metricName: templateSrv.replace(annotation.metricName), dimensions: this.convertDimensionFormat(annotation.dimensions, {}), @@ -341,6 +341,13 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { return this.defaultRegion; }; + this.getActualRegion = function(region) { + if (region === 'default' || _.isEmpty(region)) { + return this.getDefaultRegion(); + } + return region; + }; + this.getExpandedVariables = function(target, dimensionKey, variable, templateSrv) { /* if the all checkbox is marked we should add all values to the targets */ var allSelected = _.find(variable.options, {'selected': true, 'text': 'All'}); diff --git a/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts b/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts index 57a5fba443b..6bf22b0f2e7 100644 --- a/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts +++ b/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts @@ -28,7 +28,7 @@ export class CloudWatchQueryParameterCtrl { target.statistics = target.statistics || ['Average']; target.dimensions = target.dimensions || {}; target.period = target.period || ''; - target.region = target.region || ''; + target.region = target.region || 'default'; $scope.regionSegment = uiSegmentSrv.getSegmentForValue($scope.target.region, 'select region'); $scope.namespaceSegment = uiSegmentSrv.getSegmentForValue($scope.target.namespace, 'select namespace'); @@ -51,7 +51,7 @@ export class CloudWatchQueryParameterCtrl { $scope.removeStatSegment = uiSegmentSrv.newSegment({fake: true, value: '-- remove stat --'}); if (_.isEmpty($scope.target.region)) { - $scope.target.region = $scope.datasource.getDefaultRegion(); + $scope.target.region = 'default'; } if (!$scope.onChange) { @@ -148,6 +148,10 @@ export class CloudWatchQueryParameterCtrl { $scope.getRegions = function() { return $scope.datasource.metricFindQuery('regions()') + .then(function(results) { + results.unshift({ text: 'default'}); + return results; + }) .then($scope.transformToSegments(true)); }; diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts index f278ce9305d..5eda60d5b9e 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts @@ -165,6 +165,55 @@ describe('CloudWatchDatasource', function() { }); }); + describe('When query region is "default"', function () { + it('should return the datasource region if empty or "default"', function() { + var defaultRegion = instanceSettings.jsonData.defaultRegion; + + expect(ctx.ds.getActualRegion()).to.be(defaultRegion); + expect(ctx.ds.getActualRegion('')).to.be(defaultRegion); + expect(ctx.ds.getActualRegion("default")).to.be(defaultRegion); + }); + + it('should return the specified region if specified', function() { + expect(ctx.ds.getActualRegion('some-fake-region-1')).to.be('some-fake-region-1'); + }); + + var requestParams; + beforeEach(function() { + ctx.ds.performTimeSeriesQuery = function(request) { + requestParams = request; + return ctx.$q.when({data: {}}); + }; + }); + + it('should query for the datasource region if empty or "default"', function(done) { + var query = { + range: { from: 'now-1h', to: 'now' }, + rangeRaw: { from: 1483228800, to: 1483232400 }, + targets: [ + { + region: 'default', + namespace: 'AWS/EC2', + metricName: 'CPUUtilization', + dimensions: { + InstanceId: 'i-12345678' + }, + statistics: ['Average'], + period: 300 + } + ] + }; + + ctx.ds.query(query).then(function(result) { + expect(requestParams.queries[0].region).to.be(instanceSettings.jsonData.defaultRegion); + done(); + }); + ctx.$rootScope.$apply(); + }); + + + }); + describe('When performing CloudWatch query for extended statistics', function() { var requestParams; @@ -348,6 +397,26 @@ describe('CloudWatchDatasource', function() { }); }); + describeMetricFindQuery('dimension_values(default,AWS/EC2,CPUUtilization,InstanceId)', scenario => { + scenario.setup(() => { + scenario.requestResponse = { + results: { + metricFindQuery: { + tables: [ + { rows: [['i-12345678', 'i-12345678']] } + ] + } + } + }; + }); + + it('should call __ListMetrics and return result', () => { + expect(scenario.result[0].text).to.contain('i-12345678'); + expect(scenario.request.queries[0].type).to.be('metricFindQuery'); + expect(scenario.request.queries[0].subtype).to.be('dimension_values'); + }); + }); + it('should caclculate the correct period', function () { var hourSec = 60 * 60; var daySec = hourSec * 24; From 66bc1fea2da651c28b288ebf7e062f0c68b26154 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 11 Dec 2017 09:45:17 +0100 Subject: [PATCH 55/89] changelog: adds note about closing #10131 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8b1dc8bdce..6ba7b4a1aff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,9 @@ From `/etc/grafana/datasources` to `/etc/grafana/provisioning/datasources` when * **Dashboard**: Make it possible to start dashboards from search and dashboard list panel [#1871](https://github.com/grafana/grafana/issues/1871) * **Annotations**: Posting annotations now return the id of the annotation [#9798](https://github.com/grafana/grafana/issues/9798) * **Systemd**: Use systemd notification ready flag [#10024](https://github.com/grafana/grafana/issues/10024), thx [@jgrassler](https://github.com/jgrassler) -* **Github**: Use organizations_url provided from github to verify user belongs in org. [#10111](https://github.com/grafana/grafana/issues/10111), thx [@adiletmaratov](https://github.com/adiletmaratov) +* **Github**: Use organizations_url provided from github to verify user belongs in org. [#10111](https://github.com/grafana/grafana/issues/10111), thx +[@adiletmaratov](https://github.com/adiletmaratov) +* **Backend**: Fixed bug where Grafana exited before all sub routines where finished [#10131](https://github.com/grafana/grafana/issues/10131) ## Tech * **RabbitMq**: Remove support for publishing events to RabbitMQ [#9645](https://github.com/grafana/grafana/issues/9645) From 2ce4a8e4c5ad0ca72733acd6dd749f4f87ded79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 10:52:38 +0100 Subject: [PATCH 56/89] fix: fixed build failure --- public/app/features/dashboard/dashboardLoaderSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/dashboard/dashboardLoaderSrv.js b/public/app/features/dashboard/dashboardLoaderSrv.js index 708e6b563e4..d5e257de665 100644 --- a/public/app/features/dashboard/dashboardLoaderSrv.js +++ b/public/app/features/dashboard/dashboardLoaderSrv.js @@ -43,7 +43,7 @@ function (angular, moment, _, $, kbn, dateMath, impressionSrv) { }); } else { promise = backendSrv.getDashboard($routeParams.type, $routeParams.slug) - .then(result => { + .then(function(result) { if (result.meta.isFolder) { $rootScope.appEvent("alert-error", ['Dashboard not found']); throw new Error("Dashboard not found"); From 795d9c0362b6bd4b68742b3fda0d6c12dbfc42ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 11:42:13 +0100 Subject: [PATCH 57/89] ux: fixed navbar and sidemenu z-index issue and improved responsive rules --- pkg/cmd/grafana-server/main.go | 2 +- public/sass/components/_navbar.scss | 29 ++++++++++++++++++++------- public/sass/components/_sidemenu.scss | 9 +-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go index 183e4b047cd..46c899d3d81 100644 --- a/pkg/cmd/grafana-server/main.go +++ b/pkg/cmd/grafana-server/main.go @@ -30,7 +30,7 @@ import ( _ "github.com/grafana/grafana/pkg/tsdb/testdata" ) -var version = "4.6.0" +var version = "5.0.0" var commit = "NA" var buildstamp string var build_date string diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 25d7c6ffa82..231adbc4a55 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -1,7 +1,7 @@ .navbar { position: relative; - padding-left: $side-menu-width; + margin-left: 40px; // box-shadow: $navbarShadow; z-index: $zindex-navbar-fixed; // background: $navbarBackground; @@ -11,12 +11,6 @@ flex-grow: 1; } -.sidemenu-open { - .navbar { - padding-left: 15px; - } -} - .navbar-page-btn { text-overflow: ellipsis; overflow: hidden; @@ -44,6 +38,8 @@ line-height: 8px; opacity: 0.75; margin-right: 8px; + // icon hidden on smaller screens + display: none; } } @@ -111,3 +107,22 @@ } } } + +@include media-breakpoint-up(sm) { + .navbar { + margin-left: 50px; + } + + .sidemenu-open { + .navbar { + margin-left: 15px; + } + } + + .navbar-page-btn { + .gicon { + display: inline-block; + } + } +} + diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 05882d75fc9..3bedd8a9f14 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -16,7 +16,6 @@ .sidemenu__close { display: none; } - } // body class that hides sidemenu @@ -191,12 +190,6 @@ li.sidemenu-org-switcher { } @include media-breakpoint-down(xs) { - .sidemenu-open { - .navbar { - padding-left: 60px !important; - } - } - .sidemenu-open--xs { .sidemenu { width: 100%; @@ -227,7 +220,7 @@ li.sidemenu-org-switcher { } .sidemenu__logo_small_breakpoint { - padding: 12px 10px 26px; + padding: 16px 10px 26px; display: flex; flex-direction: row; justify-content: space-between; From 09cc60ffe4285bc36d9e0097fe879be3a7f2abd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 12:13:45 +0100 Subject: [PATCH 58/89] ux: dashboard settings progress --- .../components/EmptyListCTA/EmptyListCTA.tsx | 4 +- .../features/dashboard/settings/settings.ts | 2 +- .../features/templating/partials/editor.html | 113 ++++++++++-------- public/sass/components/_empty_list_cta.scss | 20 ++-- public/sass/components/_infobox.scss | 10 -- public/sass/components/_navbar.scss | 2 - 6 files changed, 74 insertions(+), 77 deletions(-) diff --git a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx index a5a78a63bf1..1583303dfa1 100644 --- a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx +++ b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React, { Component } from 'react'; export interface IProps { model: any; @@ -17,7 +17,7 @@ class EmptyListCTA extends Component { proTipTarget } = this.props.model; return ( -
    +
    {title}
    {buttonTitle}
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index c013e9d4720..744fcc46ca2 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -11,7 +11,7 @@ export class SettingsCtrl { sections: any[] = [ {title: 'General', id: 'settings', icon: "fa fa-fw fa-sliders"}, {title: 'Annotations', id: 'annotations', icon: "fa fa-fw fa-comment-o"}, - {title: 'Templating', id: 'templating', icon: "fa fa-fw fa-dollar"}, + {title: 'Variables', id: 'templating', icon: "fa fa-fw fa-dollar"}, {title: 'Links', id: 'links', icon: "fa fa-fw fa-external-link"}, {title: 'Versions', id: 'versions', icon: "fa fa-fw fa-history"}, {title: 'View JSON', id: 'view_json', icon: "fa fa-fw fa-code"}, diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 72f82f43a8f..9013a4642d8 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -1,64 +1,71 @@ -

    Templating

    +

    Variables

    +
    - No template variables defined -

    +
    +
    There are no template variables added yet
    + + + Add variable + +
    +
    + What does variables do? +
    +

    Variables enables more interactive and dynamic dashboards. Instead of hard-coding things like server or sensor names + in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of + the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. + + Checkout the + + Templating documentation + for more information. +

    +
    - - - - - - - - - - - - - - - - - - -
    VariableDefinition
    - - ${{variable.name}} - - - {{variable.query}} - - - Duplicate - - - - - -
    -
    +
    +
    +
    + New +
    -
    -
    -
    What does templating do?
    -

    Templating allows for more interactive and dynamic dashboards. Instead of hard-coding things like server, application - and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of - the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. -
    -
    + + + + + + + + + + + + - Checkout the Templating documentation for more information. -

    - - - -
    -
    -   New +
    + + + + + +
    VariableDefinition
    + + ${{variable.name}} + + + {{variable.query}} + + + Duplicate + + + + + +

    diff --git a/public/sass/components/_empty_list_cta.scss b/public/sass/components/_empty_list_cta.scss index a8c235d83db..844c8c87866 100644 --- a/public/sass/components/_empty_list_cta.scss +++ b/public/sass/components/_empty_list_cta.scss @@ -1,21 +1,23 @@ -.empty-list-cta { - background-color: $search-filter-box-bg; - text-align: center; +.empty-list-cta { + background-color: $search-filter-box-bg; + text-align: center; + padding: 2rem 2rem 1rem 2rem; + border-radius: $border-radius; } .empty-list-cta__title { - padding-bottom: 30px; - font-style: italic; + padding-bottom: 30px; + font-style: italic; } .empty-list-cta__button { - margin-bottom: 50px; + margin-bottom: 50px; } .empty-list-cta__pro-tip { - padding-bottom: 20px; + padding-bottom: 1rem; } .empty-list-cta__pro-tip-link { - margin-left: 5px; -} \ No newline at end of file + margin-left: 5px; +} diff --git a/public/sass/components/_infobox.scss b/public/sass/components/_infobox.scss index 0d3cbcd52b8..2a9c03cbdfa 100644 --- a/public/sass/components/_infobox.scss +++ b/public/sass/components/_infobox.scss @@ -1,13 +1,3 @@ -// .grafana-info-box::before { -// content: "\f05a"; -// font-family:'FontAwesome'; -// position: absolute; -// top: -13px; -// left: -8px; -// font-size: 20px; -// color: $text-color; -// } - .grafana-info-box { position: relative; background: $info-box-background; diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index 7cde09b1dac..15f27e81e93 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -2,9 +2,7 @@ .navbar { position: relative; padding-left: $side-menu-width; - // box-shadow: $navbarShadow; z-index: $zindex-navbar-fixed; - // background: $navbarBackground; height: $navbarHeight; padding-right: $spacer; display: flex; From 05ec7541c80ffaaead518de28091d515b386a02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 13:04:06 +0100 Subject: [PATCH 59/89] ux: dashboard settings progress --- .../app/features/annotations/editor_ctrl.ts | 15 +- .../features/annotations/partials/editor.html | 212 ++++++++---------- .../features/dashboard/settings/settings.ts | 9 +- public/app/features/templating/editor_ctrl.ts | 6 +- .../features/templating/partials/editor.html | 20 +- public/sass/_variables.scss | 2 +- public/sass/components/_empty_list_cta.scss | 11 +- public/sass/components/_navbar.scss | 3 +- 8 files changed, 121 insertions(+), 157 deletions(-) diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts index a52e241ce35..0dea22f32ad 100644 --- a/public/app/features/annotations/editor_ctrl.ts +++ b/public/app/features/annotations/editor_ctrl.ts @@ -26,7 +26,7 @@ export class AnnotationsEditorCtrl { ]; /** @ngInject */ - constructor(private $scope, private datasourceSrv) { + constructor($scope, private datasourceSrv) { $scope.ctrl = this; this.mode = 'list'; @@ -62,7 +62,6 @@ export class AnnotationsEditorCtrl { update() { this.reset(); this.mode = 'list'; - this.$scope.broadcastRefresh(); } setupNew() { @@ -74,28 +73,16 @@ export class AnnotationsEditorCtrl { this.annotations.push(this.currentAnnotation); this.reset(); this.mode = 'list'; - this.$scope.broadcastRefresh(); - this.$scope.dashboard.updateSubmenuVisibility(); } removeAnnotation(annotation) { var index = _.indexOf(this.annotations, annotation); this.annotations.splice(index, 1); - this.$scope.dashboard.updateSubmenuVisibility(); - this.$scope.broadcastRefresh(); } onColorChange(newColor) { this.currentAnnotation.iconColor = newColor; } - - annotationEnabledChange() { - this.$scope.broadcastRefresh(); - } - - annotationHiddenChanged() { - this.$scope.dashboard.updateSubmenuVisibility(); - } } coreModule.controller('AnnotationsEditorCtrl', AnnotationsEditorCtrl); diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index 1cdf106ee01..b0a0f43a0ec 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -1,147 +1,113 @@ -

    Annotations

    +

    + Annotations + > New + > Edit +

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - No annotation queries defined +
    + +
    +
    +
    There are no custom annotation queries added yet
    + + + Add Annotation Query + +
    +
    What are Annotations?
    +

    + Annotations provide a way to integrate event data into your graphs. They are visualized as vertical lines and icons + on all graph panels. When you hover over an annotation icon you can get event text & tags for the event. You can add annotation events + directly from grafana by holding CTRL or CMD + click on graph (or drag region). These will be stored in Grafana's annotation database. +

    + Checkout the Annotations documentation for more information. +
    +
    - +
    +
    + New +
    + +
    + + + + + + + + - - + - -
    Query nameData source
    +   {{annotation.name}} +   {{annotation.name}} (Built-in) + {{annotation.datasource || 'Default'}} + - - - Edit - -
    -
    + + +
    -
    -
    -   New +
    +
    +
    General
    +
    +
    + Name + +
    +
    + Data source +
    + +
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    +
    + + + + +
    + + + + +
    +
    +
    + +
    Query
    + + + + + +
    +
    + + +
    +
    +
    +
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 744fcc46ca2..186d900b3a4 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -20,9 +20,9 @@ export class SettingsCtrl { ]; /** @ngInject */ - constructor($scope, private $location, private $rootScope) { + constructor(private $scope, private $location, private $rootScope) { // temp hack - $scope.dashboard = this.dashboard; + this.$scope.dashboard = this.dashboard; const params = this.$location.search(); const url = $location.path(); @@ -35,6 +35,11 @@ export class SettingsCtrl { this.viewId = params.editview; $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); + + this.$scope.$on('$destroy', () => { + this.dashboard.updateSubmenuVisibility(); + this.$rootScope.$broadcast("refresh"); + }); } onRouteUpdated() { diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts index c10bc5bb5ec..63fc862eab9 100644 --- a/public/app/features/templating/editor_ctrl.ts +++ b/public/app/features/templating/editor_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from 'app/core/core_module'; import {variableTypes} from './variable'; @@ -45,6 +43,10 @@ export class VariableEditorCtrl { }); }; + $scope.setMode = function(mode) { + $scope.mode = mode; + }; + $scope.add = function() { if ($scope.isValid()) { variableSrv.addVariable($scope.current); diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 9013a4642d8..4e6c53eb839 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -1,19 +1,22 @@ -

    Variables

    -
    + +

    + Variables + > New + > Edit +

    +
    There are no template variables added yet
    - + Add variable
    -
    - What does variables do? -
    +
    What does variables do?

    Variables enables more interactive and dynamic dashboards. Instead of hard-coding things like server or sensor names in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. @@ -29,7 +32,7 @@

    - New + New
    @@ -50,7 +53,6 @@ -
    {{variable.query}} @@ -70,7 +72,7 @@
    -
    Variable
    +
    General
    diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index a0c52dee2ef..d031a0485f6 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -199,11 +199,11 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www // Try to avoid customizing these :) $zindex-dropdown: 1000; $zindex-navbar-fixed: 1020; +$zindex-sidemenu: 1025; $zindex-tooltip: 1030; $zindex-modal-backdrop: 1040; $zindex-modal: 1050; $zindex-typeahead: 1060; -$zindex-sidemenu: $zindex-navbar-fixed; // Buttons // diff --git a/public/sass/components/_empty_list_cta.scss b/public/sass/components/_empty_list_cta.scss index 844c8c87866..23399d771aa 100644 --- a/public/sass/components/_empty_list_cta.scss +++ b/public/sass/components/_empty_list_cta.scss @@ -1,8 +1,13 @@ .empty-list-cta { background-color: $search-filter-box-bg; text-align: center; - padding: 2rem 2rem 1rem 2rem; + padding: 2rem; border-radius: $border-radius; + + .grafana-info-box { + max-width: 700px; + margin: 0 auto; + } } .empty-list-cta__title { @@ -14,10 +19,6 @@ margin-bottom: 50px; } -.empty-list-cta__pro-tip { - padding-bottom: 1rem; -} - .empty-list-cta__pro-tip-link { margin-left: 5px; } diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index b14f604f701..a86d7bf9c54 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -147,7 +147,8 @@ .sidemenu-open { .navbar { - margin-left: 15px; + padding-left: 15px; + margin-left: 0; } } From a682475152dba612898e6dee9120a9d8ad41f9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 13:09:25 +0100 Subject: [PATCH 60/89] fix: fixed failing test --- .../EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap | 2 +- public/app/features/annotations/editor_ctrl.ts | 4 ++++ public/app/features/annotations/partials/editor.html | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap b/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap index 0598d7ecd4e..0da3d94aaa8 100644 --- a/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap +++ b/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap @@ -2,7 +2,7 @@ exports[`CollorPalette renders correctly 1`] = `

    - Annotations + Annotations > New > Edit

    @@ -32,7 +32,7 @@ New
    - +
    From 61dbcfd35b372f79f2744954178f9abac6d1c048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 13:29:23 +0100 Subject: [PATCH 61/89] ux: dashboard settings progress --- .../features/annotations/partials/editor.html | 40 +++++++++---------- .../features/dashboard/dashnav/dashnav.html | 10 ++--- public/sass/components/_empty_list_cta.scss | 6 +-- public/sass/components/_navbar.scss | 12 +++++- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index 77d67d3986d..62175e5278f 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -7,26 +7,6 @@
    - -
    -
    -
    There are no custom annotation queries added yet
    - - - Add Annotation Query - -
    -
    What are Annotations?
    -

    - Annotations provide a way to integrate event data into your graphs. They are visualized as vertical lines and icons - on all graph panels. When you hover over an annotation icon you can get event text & tags for the event. You can add annotation events - directly from grafana by holding CTRL or CMD + click on graph (or drag region). These will be stored in Grafana's annotation database. -

    - Checkout the Annotations documentation for more information. -
    -
    -
    -
    New @@ -63,6 +43,26 @@
    Query name
    + + +
    +
    +
    There are no custom annotation queries added yet
    + + + Add Annotation Query + +
    +
    What are Annotations?
    +

    + Annotations provide a way to integrate event data into your graphs. They are visualized as vertical lines and icons + on all graph panels. When you hover over an annotation icon you can get event text & tags for the event. You can add annotation events + directly from grafana by holding CTRL or CMD + click on graph (or drag region). These will be stored in Grafana's annotation database. +

    + Checkout the Annotations documentation for more information. +
    +
    +
    diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index b5e151bf966..03453611036 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -27,23 +27,23 @@ - - - - -
    diff --git a/public/sass/components/_empty_list_cta.scss b/public/sass/components/_empty_list_cta.scss index 23399d771aa..dd50f3a3b8b 100644 --- a/public/sass/components/_empty_list_cta.scss +++ b/public/sass/components/_empty_list_cta.scss @@ -1,7 +1,7 @@ .empty-list-cta { background-color: $search-filter-box-bg; text-align: center; - padding: 2rem; + padding: $spacer*2; border-radius: $border-radius; .grafana-info-box { @@ -11,12 +11,12 @@ } .empty-list-cta__title { - padding-bottom: 30px; + padding-bottom: $spacer*3; font-style: italic; } .empty-list-cta__button { - margin-bottom: 50px; + margin-bottom: $spacer*3; } .empty-list-cta__pro-tip-link { diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss index a86d7bf9c54..1f8e2419197 100644 --- a/public/sass/components/_navbar.scss +++ b/public/sass/components/_navbar.scss @@ -23,7 +23,10 @@ @include navbar-alt-look(); } - .navbar-buttons--actions, + .navbar-button--add-panel, + .navbar-button--star, + .navbar-button--share, + .navbar-button--settings, .navbar-page-btn .fa-caret-down, .gf-timepicker-nav { display: none; @@ -39,7 +42,11 @@ @include navbar-alt-look(); } - .navbar-buttons--actions { + .navbar-button--add-panel, + .navbar-button--star, + .navbar-button--save, + .navbar-button--settings, + .navbar-page-btn .fa-caret-down { display: none; } @@ -90,6 +97,7 @@ &--close { display: none; + margin-right: 0; } } From 7f597283e8a79d623a854c1daf463d36b347f6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 13:47:04 +0100 Subject: [PATCH 62/89] ux: dashboard settings progress --- .../app/features/dashboard/dashboard_ctrl.ts | 6 - .../app/features/dashboard/dashnav/dashnav.ts | 12 -- .../features/dashboard/partials/settings.html | 3 +- .../features/dashboard/settings/settings.html | 4 + .../features/dashboard/settings/settings.ts | 11 +- public/app/features/dashlinks/editor.html | 117 +++++++++--------- 6 files changed, 71 insertions(+), 82 deletions(-) diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts index 2c9d028ddf8..2909c55bad5 100644 --- a/public/app/features/dashboard/dashboard_ctrl.ts +++ b/public/app/features/dashboard/dashboard_ctrl.ts @@ -122,12 +122,6 @@ export class DashboardCtrl implements PanelContainer { this.$rootScope.$broadcast("refresh"); } - onFolderChange(folder) { - this.dashboard.folderId = folder.id; - this.dashboard.meta.folderId = folder.id; - this.dashboard.meta.folderTitle= folder.title; - } - getPanelContainer() { return this; } diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 837d0d76537..284a913401d 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -131,18 +131,6 @@ export class DashNavCtrl { return this.dashboardSrv.showSaveAsModal(); } - viewJson() { - var clone = this.dashboard.getSaveModelClone(); - - this.$rootScope.appEvent('show-json-editor', { - object: clone, - }); - } - - onFolderChange(folderId) { - this.dashboard.folderId = folderId; - } - showSearch() { this.$rootScope.appEvent('show-dash-search'); } diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index 2295ff2713a..4285c2248ab 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -56,8 +56,7 @@
    - - +
    diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 465e7976d99..382f2059fea 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -62,3 +62,7 @@
    + +
    + +
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 186d900b3a4..60c886e89e5 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -21,8 +21,9 @@ export class SettingsCtrl { /** @ngInject */ constructor(private $scope, private $location, private $rootScope) { - // temp hack - this.$scope.dashboard = this.dashboard; + // temp hack for annotations and variables editors + // that rely on inherited scope + $scope.dashboard = this.dashboard; const params = this.$location.search(); const url = $location.path(); @@ -56,6 +57,12 @@ export class SettingsCtrl { }); }); } + + onFolderChange(folder) { + this.dashboard.folderId = folder.id; + this.dashboard.meta.folderId = folder.id; + this.dashboard.meta.folderTitle= folder.title; + } } export function dashboardSettings() { diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index 11dfdf74c1f..155aa78a6fe 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -1,80 +1,77 @@ -
    -
    Links and Dash Navigation
    +

    + Dashboard Links +

    -
    - -
    -
    +
    +
    +
    +
    + Type +
    + +
    +
    +
    + With tags + +
    + +
    + Title + +
    +
    - Type -
    - -
    +
  • Url
    • +
    -
    - With tags - -
    - -
    + +
    Title - +
    -
    -
    -
  • Url
    • - -
    -
    - Title - -
    +
    + Tooltip + +
    -
    - Tooltip - -
    - -
    - Icon -
    - -
    +
    + Icon +
    +
    +
    -
    -
    -
    - Include -
    -
    -
    - - - +
    +
    +
    + Include
    +
    + + + +
    +
    -
    -
    - -
    -
    - -
    -
    - -
    +
    +
    + +
    +
    + +
    +
    +
    - - From c4b759fe6d6c9d0218a5bc6c20a25c3126b3099f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 15:04:48 +0100 Subject: [PATCH 63/89] ux: dashboard settings progress --- .../features/dashboard/history/history.html | 242 ++++++++---------- .../partials/addAnnotationModal.html | 65 ----- .../features/dashboard/partials/settings.html | 64 ----- .../features/dashboard/settings/settings.html | 12 + .../features/dashboard/settings/settings.ts | 13 +- .../features/templating/partials/editor.html | 2 +- 6 files changed, 130 insertions(+), 268 deletions(-) delete mode 100644 public/app/features/dashboard/partials/addAnnotationModal.html delete mode 100644 public/app/features/dashboard/partials/settings.html diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html index 7968f1162c5..8ccf6e5b695 100644 --- a/public/app/features/dashboard/history/history.html +++ b/public/app/features/dashboard/history/history.html @@ -1,146 +1,122 @@ -
    -

    - Version history -

    +

    + Version History + + > Comparing {{ctrl.baseInfo.version}} + + {{ctrl.newInfo.version}} + (Latest) + +

    - - - +
    +
    +
    -
    +
    +
    + + Fetching history list… +
    -
    -
    - - Fetching history list… -
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    VersionDateUpdated ByNotes
    + + + {{revision.version}}{{revision.createdDateString}}{{revision.createdBy}}{{revision.message}} + +   Restore + + +   Latest + +
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    VersionDateUpdated ByNotes
    - - - {{revision.version}}{{revision.createdDateString}}{{revision.createdBy}}{{revision.message}} - -   Restore - - -   Latest - -
    - -
    - - Fetching more entries… -
    - -
    -
    - - -
    -
    -
    -
    -
    - -
    - - -
    -
    +
    - Fetching changes… + Fetching more entries…
    -
    - -   Restore to version {{ctrl.baseInfo.version}} - -

    - Comparing Version {{ctrl.baseInfo.version}} - - Version {{ctrl.newInfo.version}} - (Latest) -

    -
    -

    - Version {{ctrl.newInfo.version}} updated by - {{ctrl.newInfo.createdBy}} - {{ctrl.newInfo.ageString}} - - {{ctrl.newInfo.message}} -

    -

    - Version {{ctrl.baseInfo.version}} updated by - {{ctrl.baseInfo.createdBy}} - {{ctrl.baseInfo.ageString}} - - {{ctrl.baseInfo.message}} -

    -
    -
    -
    -
    +
    +
    +
    + +
    +
    + + Fetching changes… +
    + +
    + +
    +

    + Version {{ctrl.newInfo.version}} updated by + {{ctrl.newInfo.createdBy}} + {{ctrl.newInfo.ageString}} + - {{ctrl.newInfo.message}} +

    +

    + Version {{ctrl.baseInfo.version}} updated by + {{ctrl.baseInfo.createdBy}} + {{ctrl.baseInfo.ageString}} + - {{ctrl.baseInfo.message}} +

    +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    diff --git a/public/app/features/dashboard/partials/addAnnotationModal.html b/public/app/features/dashboard/partials/addAnnotationModal.html deleted file mode 100644 index f55f888375f..00000000000 --- a/public/app/features/dashboard/partials/addAnnotationModal.html +++ /dev/null @@ -1,65 +0,0 @@ -
    - -
    -

    - Add Annotation -

    - - - - -
    - - -
    - -
    -
    -
    diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html deleted file mode 100644 index 4285c2248ab..00000000000 --- a/public/app/features/dashboard/partials/settings.html +++ /dev/null @@ -1,64 +0,0 @@ -

    General

    - -
    -
    - - -
    -
    - - -
    -
    - - - -
    - - -
    - -
    -
    Options
    -
    -
    - -
    - -
    -
    - - - - -
    -
    - -
    -
    Panel Options
    -
    - -
    - -
    -
    -
    - - -
    - - - - - diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 382f2059fea..e594c7c7563 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -66,3 +66,15 @@
    + +
    + +
    + +
    +

    View JSON

    + +
    + +
    +
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 60c886e89e5..10dd857e255 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -7,6 +7,7 @@ export class SettingsCtrl { dashboard: DashboardModel; isOpen: boolean; viewId: string; + json: string; sections: any[] = [ {title: 'General', id: 'settings', icon: "fa fa-fw fa-sliders"}, @@ -31,21 +32,23 @@ export class SettingsCtrl { for (let section of this.sections) { const sectionParams = _.defaults({editview: section.id}, params); section.url = url + '?' + $.param(sectionParams); - console.log(section.url); } - this.viewId = params.editview; - $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); - this.$scope.$on('$destroy', () => { this.dashboard.updateSubmenuVisibility(); this.$rootScope.$broadcast("refresh"); }); + + this.onRouteUpdated(); + $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); } onRouteUpdated() { - console.log('settings route updated'); this.viewId = this.$location.search().editview; + + if (this.viewId) { + this.json = JSON.stringify(this.dashboard.getSaveModelClone(), null, 2); + } } hideSettings() { diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 4e6c53eb839..424023d6054 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -10,7 +10,7 @@
    -
    There are no template variables added yet
    +
    There are no variables added yet
    Add variable From 008b9bb3e92df492928dec8150df72a2c86def9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 16:28:57 +0100 Subject: [PATCH 64/89] ux: dashboard settings work progress --- public/app/features/dashboard/all.ts | 2 +- .../features/dashboard/dashboard_save_as.ts | 81 ++++++++++++++++ .../app/features/dashboard/dashnav/dashnav.ts | 54 ----------- .../features/dashboard/history/history.html | 26 +++-- .../app/features/dashboard/save_as_modal.ts | 95 ------------------- .../features/dashboard/settings/settings.html | 26 +++++ .../features/dashboard/settings/settings.ts | 31 +++++- ...odal.jest.ts => dashboard_save_as.jest.ts} | 4 +- public/app/features/panel/panel_ctrl.ts | 15 ++- 9 files changed, 161 insertions(+), 173 deletions(-) create mode 100644 public/app/features/dashboard/dashboard_save_as.ts delete mode 100644 public/app/features/dashboard/save_as_modal.ts rename public/app/features/dashboard/specs/{save_as_modal.jest.ts => dashboard_save_as.jest.ts} (92%) diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts index 4c7e6058984..eb61ca6aa11 100644 --- a/public/app/features/dashboard/all.ts +++ b/public/app/features/dashboard/all.ts @@ -4,7 +4,7 @@ import './history/history'; import './dashboardLoaderSrv'; import './dashnav/dashnav'; import './submenu/submenu'; -import './save_as_modal'; +import './dashboard_save_as'; import './save_modal'; import './shareModalCtrl'; import './shareSnapshotCtrl'; diff --git a/public/app/features/dashboard/dashboard_save_as.ts b/public/app/features/dashboard/dashboard_save_as.ts new file mode 100644 index 00000000000..5ce487587e4 --- /dev/null +++ b/public/app/features/dashboard/dashboard_save_as.ts @@ -0,0 +1,81 @@ +import coreModule from 'app/core/core_module'; + +const template = ` +

    Save As

    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    + +`; + +export class SaveDashboardAsCtrl { + clone: any; + folderId: any; + dismiss: () => void; + + /** @ngInject */ + constructor(private dashboardSrv) { + var dashboard = this.dashboardSrv.getCurrent(); + this.clone = dashboard.getSaveModelClone(); + this.clone.id = null; + this.clone.title += ' Copy'; + this.clone.editable = true; + this.clone.hideControls = false; + this.folderId = dashboard.folderId; + + // remove alerts if source dashboard is already persisted + // do not want to create alert dupes + if (dashboard.id > 0) { + this.clone.panels.forEach(panel => { + if (panel.type === "graph" && panel.alert) { + delete panel.thresholds; + } + delete panel.alert; + }); + } + + delete this.clone.autoUpdate; + } + + save() { + return this.dashboardSrv.save(this.clone).then(this.dismiss); + } + + keyDown(evt) { + if (evt.keyCode === 13) { + this.save(); + } + } + + onFolderChange(folder) { + this.clone.folderId = folder.id; + } +} + +export function saveDashboardAsDirective() { + return { + restrict: 'E', + template: template, + controller: SaveDashboardAsCtrl, + bindToController: true, + controllerAs: 'ctrl', + scope: {} + }; +} + +coreModule.directive('saveDashboardAs', saveDashboardAsDirective); diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 284a913401d..aed803efb9a 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -1,4 +1,3 @@ -import _ from 'lodash'; import moment from 'moment'; import angular from 'angular'; import {appEvents, NavModel} from 'app/core/core'; @@ -15,13 +14,11 @@ export class DashNavCtrl { private $rootScope, private dashboardSrv, private $location, - private backendSrv, public playlistSrv, navModelSrv) { this.navModel = navModelSrv.getDashboardNav(this.dashboard, this); appEvents.on('save-dashboard', this.saveDashboard.bind(this), $scope); - appEvents.on('delete-dashboard', this.deleteDashboard.bind(this), $scope); if (this.dashboard.meta.isSnapshot) { var meta = this.dashboard.meta; @@ -76,61 +73,10 @@ export class DashNavCtrl { angular.element(evt.currentTarget).tooltip('hide'); } - makeEditable() { - this.dashboard.editable = true; - - return this.dashboardSrv.saveDashboard({makeEditable: true, overwrite: false}).then(() => { - // force refresh whole page - window.location.href = window.location.href; - }); - } - - exitFullscreen() { - this.$rootScope.appEvent('panel-change-view', {fullscreen: false, edit: false}); - } - saveDashboard() { return this.dashboardSrv.saveDashboard(); } - deleteDashboard() { - var confirmText = ''; - var text2 = this.dashboard.title; - - const alerts = _.sumBy(this.dashboard.panels, panel => { - return panel.alert ? 1 : 0; - }); - - if (alerts > 0) { - confirmText = 'DELETE'; - text2 = `This dashboard contains ${alerts} alerts. Deleting this dashboard will also delete those alerts`; - } - - appEvents.emit('confirm-modal', { - title: 'Delete', - text: 'Do you want to delete this dashboard?', - text2: text2, - icon: 'fa-trash', - confirmText: confirmText, - yesText: 'Delete', - onConfirm: () => { - this.dashboard.meta.canSave = false; - this.deleteDashboardConfirmed(); - } - }); - } - - deleteDashboardConfirmed() { - this.backendSrv.delete('/api/dashboards/db/' + this.dashboard.meta.slug).then(() => { - appEvents.emit('alert-success', ['Dashboard Deleted', this.dashboard.title + ' has been deleted']); - this.$location.url('/'); - }); - } - - saveDashboardAs() { - return this.dashboardSrv.showSaveAsModal(); - } - showSearch() { this.$rootScope.appEvent('show-dash-search'); } diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html index 8ccf6e5b695..c79853e5613 100644 --- a/public/app/features/dashboard/history/history.html +++ b/public/app/features/dashboard/history/history.html @@ -8,18 +8,6 @@ -
    -
    - -
    -
    @@ -75,6 +63,14 @@ ng-disabled="ctrl.isLastPage()"> Show more versions +
    @@ -89,9 +85,9 @@
    diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts deleted file mode 100644 index 643d6a36f67..00000000000 --- a/public/app/features/dashboard/save_as_modal.ts +++ /dev/null @@ -1,95 +0,0 @@ -/// - -import coreModule from 'app/core/core_module'; - -const template = ` -
    -
    -

    - - Save As... -

    - -     - - -
    - -
    -
    -
    - - -
    -
    - - -
    -
    - -
    - - Cancel -
    -
    -
    -`; - -export class SaveDashboardAsModalCtrl { - clone: any; - folderId: any; - dismiss: () => void; - - /** @ngInject */ - constructor(private dashboardSrv) { - var dashboard = this.dashboardSrv.getCurrent(); - this.clone = dashboard.getSaveModelClone(); - this.clone.id = null; - this.clone.title += ' Copy'; - this.clone.editable = true; - this.clone.hideControls = false; - this.folderId = dashboard.folderId; - - // remove alerts if source dashboard is already persisted - // do not want to create alert dupes - if (dashboard.id > 0) { - this.clone.panels.forEach(panel => { - if (panel.type === "graph" && panel.alert) { - delete panel.thresholds; - } - delete panel.alert; - }); - } - - delete this.clone.autoUpdate; - } - - save() { - return this.dashboardSrv.save(this.clone).then(this.dismiss); - } - - keyDown(evt) { - if (evt.keyCode === 13) { - this.save(); - } - } - - onFolderChange(folder) { - this.clone.folderId = folder.id; - } -} - -export function saveDashboardAsDirective() { - return { - restrict: 'E', - template: template, - controller: SaveDashboardAsModalCtrl, - bindToController: true, - controllerAs: 'ctrl', - scope: {dismiss: "&"} - }; -} - -coreModule.directive('saveDashboardAsModal', saveDashboardAsDirective); diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index e594c7c7563..4727e424214 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -78,3 +78,29 @@
    + +
    + +
    + +
    +

    Delete dashboard

    + +
    +
    +
    This dashboard contains {{ctrl.alertCount}} alerts. Deleting this dashboard will also delete those alerts
    + +
    + + +
    + +
    +
    You cannot delete this dashboard
    +
    + +
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 10dd857e255..96aadd0c690 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -1,4 +1,4 @@ -import {coreModule} from 'app/core/core'; +import {coreModule, appEvents} from 'app/core/core'; import {DashboardModel} from '../dashboard_model'; import $ from 'jquery'; import _ from 'lodash'; @@ -8,6 +8,9 @@ export class SettingsCtrl { isOpen: boolean; viewId: string; json: string; + alertCount: number; + confirmValid: boolean; + confirmText: string; sections: any[] = [ {title: 'General', id: 'settings', icon: "fa fa-fw fa-sliders"}, @@ -21,7 +24,7 @@ export class SettingsCtrl { ]; /** @ngInject */ - constructor(private $scope, private $location, private $rootScope) { + constructor(private $scope, private $location, private $rootScope, private backendSrv, private dashboardSrv) { // temp hack for annotations and variables editors // that rely on inherited scope $scope.dashboard = this.dashboard; @@ -39,6 +42,10 @@ export class SettingsCtrl { this.$rootScope.$broadcast("refresh"); }); + this.alertCount = _.sumBy(this.dashboard.panels, panel => { + return panel.alert ? 1 : 0; + }); + this.onRouteUpdated(); $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); } @@ -61,6 +68,26 @@ export class SettingsCtrl { }); } + makeEditable() { + this.dashboard.editable = true; + + return this.dashboardSrv.saveDashboard({makeEditable: true, overwrite: false}).then(() => { + // force refresh whole page + window.location.href = window.location.href; + }); + } + + confirmTextChanged() { + this.confirmValid = this.confirmText === "DELETE"; + } + + deleteDashboard() { + this.backendSrv.delete('/api/dashboards/db/' + this.dashboard.meta.slug).then(() => { + appEvents.emit('alert-success', ['Dashboard Deleted', this.dashboard.title + ' has been deleted']); + this.$location.url('/'); + }); + } + onFolderChange(folder) { this.dashboard.folderId = folder.id; this.dashboard.meta.folderId = folder.id; diff --git a/public/app/features/dashboard/specs/save_as_modal.jest.ts b/public/app/features/dashboard/specs/dashboard_save_as.jest.ts similarity index 92% rename from public/app/features/dashboard/specs/save_as_modal.jest.ts rename to public/app/features/dashboard/specs/dashboard_save_as.jest.ts index b2ab77f2255..21d0fafd6ae 100644 --- a/public/app/features/dashboard/specs/save_as_modal.jest.ts +++ b/public/app/features/dashboard/specs/dashboard_save_as.jest.ts @@ -1,4 +1,4 @@ -import { SaveDashboardAsModalCtrl } from '../save_as_modal'; +import { SaveDashboardAsCtrl } from '../dashboard_save_as'; import { describe, it, expect } from 'test/lib/common'; describe('saving dashboard as', () => { @@ -21,7 +21,7 @@ describe('saving dashboard as', () => { }, }; - var ctrl = new SaveDashboardAsModalCtrl(mockDashboardSrv); + var ctrl = new SaveDashboardAsCtrl(mockDashboardSrv); var ctx: any = { clone: ctrl.clone, ctrl: ctrl, diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index ab74a006fce..4655ff19282 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -134,20 +134,27 @@ export class PanelCtrl { getMenu() { let menu = []; menu.push({text: 'View', click: 'ctrl.viewPanel();', icon: "fa fa-fw fa-eye", shortcut: "v"}); - menu.push({text: 'Edit', click: 'ctrl.editPanel();', role: 'Editor', icon: "fa fa-fw fa-edit", shortcut: "e"}); + + if (this.dashboard.meta.canEdit) { + menu.push({text: 'Edit', click: 'ctrl.editPanel();', role: 'Editor', icon: "fa fa-fw fa-edit", shortcut: "e"}); + } + menu.push({text: 'Share', click: 'ctrl.sharePanel();', icon: "fa fa-fw fa-share", shortcut: "p s"}); let extendedMenu = this.getExtendedMenu(); menu.push({text: 'More ...', click: 'ctrl.removePanel();', icon: "fa fa-fw fa-cube", submenu: extendedMenu}); - menu.push({divider: true, role: 'Editor'}); - menu.push({text: 'Remove', click: 'ctrl.removePanel();', role: 'Editor', icon: "fa fa-fw fa-trash", shortcut: "p r"}); + if (this.dashboard.meta.canEdit) { + menu.push({divider: true, role: 'Editor'}); + menu.push({text: 'Remove', click: 'ctrl.removePanel();', role: 'Editor', icon: "fa fa-fw fa-trash", shortcut: "p r"}); + } + return menu; } getExtendedMenu() { let menu = []; - if (!this.fullscreen) { + if (!this.fullscreen && this.dashboard.meta.canEdit) { menu.push({ text: 'Duplicate', click: 'ctrl.duplicate()', role: 'Editor' }); } menu.push({text: 'Panel JSON', click: 'ctrl.editPanelJson(); dismiss();' }); From a37f1b77f16820942b4ad7b2f0b36b41a78e9491 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 11 Dec 2017 16:37:40 +0100 Subject: [PATCH 65/89] dashfolders: new dashboard with folder selected Fixes #10133 --- .../components/manage_dashboards/manage_dashboards.html | 6 +++--- public/app/core/routes/dashboard_loaders.ts | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html index 957bca0262c..a19a63a550b 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.html +++ b/public/app/core/components/manage_dashboards/manage_dashboards.html @@ -4,7 +4,7 @@
    - + Dashboard @@ -88,11 +88,11 @@ -
    \ No newline at end of file +
    diff --git a/public/app/core/routes/dashboard_loaders.ts b/public/app/core/routes/dashboard_loaders.ts index bacd387456e..4e32a378a3b 100644 --- a/public/app/core/routes/dashboard_loaders.ts +++ b/public/app/core/routes/dashboard_loaders.ts @@ -31,7 +31,7 @@ export class LoadDashboardCtrl { export class NewDashboardCtrl { /** @ngInject */ - constructor($scope) { + constructor($scope, $routeParams) { $scope.initDashboard({ meta: { canStar: false, canShare: false, isNew: true }, dashboard: { @@ -42,7 +42,8 @@ export class NewDashboardCtrl { gridPos: {x: 0, y: 0, w: 12, h: 9}, title: 'Panel Title', } - ] + ], + folderId: Number($routeParams.folderId) }, }, $scope); } From 97bd00c5201e764b25a4f11e96156fb7a409d48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 16:46:10 +0100 Subject: [PATCH 66/89] ux: dashboard settings work progress --- public/app/features/dashboard/settings/settings.html | 5 ++--- public/app/features/dashboard/settings/settings.ts | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 4727e424214..f7eb10ecb24 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -89,11 +89,10 @@
    This dashboard contains {{ctrl.alertCount}} alerts. Deleting this dashboard will also delete those alerts
    - +
    - diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 96aadd0c690..0058529bc7a 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -46,6 +46,8 @@ export class SettingsCtrl { return panel.alert ? 1 : 0; }); + this.confirmValid = this.alertCount === 0; + this.onRouteUpdated(); $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); } From cc046f03aa3dc20e1ec0a819fa605f859db5f249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Dec 2017 17:19:17 +0100 Subject: [PATCH 67/89] ux: dashboard settings progress --- .../features/dashboard/settings/settings.html | 38 +++++---- .../features/dashboard/settings/settings.ts | 83 ++++++++++++------- public/app/partials/confirm_modal.html | 1 - 3 files changed, 79 insertions(+), 43 deletions(-) diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index f7eb10ecb24..76a297c50ee 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -86,20 +86,30 @@

    Delete dashboard

    -
    -
    -
    This dashboard contains {{ctrl.alertCount}} alerts. Deleting this dashboard will also delete those alerts
    - -
    - - -
    - -
    -
    You cannot delete this dashboard
    +
    +
    This dashboard contains {{ctrl.alertCount}} alerts. Deleting this dashboard will also delete those alerts
    +
    +
    + +
    +

    Settings view not found

    + +
    +
    The settings page could not be found or you do not have permission to access it
    +
    +
    + +
    +

    Make Editable

    + + +
    + diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 0058529bc7a..d19165e832f 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -1,5 +1,5 @@ -import {coreModule, appEvents} from 'app/core/core'; -import {DashboardModel} from '../dashboard_model'; +import { coreModule, appEvents, contextSrv } from 'app/core/core'; +import { DashboardModel } from '../dashboard_model'; import $ from 'jquery'; import _ from 'lodash'; @@ -11,17 +11,7 @@ export class SettingsCtrl { alertCount: number; confirmValid: boolean; confirmText: string; - - sections: any[] = [ - {title: 'General', id: 'settings', icon: "fa fa-fw fa-sliders"}, - {title: 'Annotations', id: 'annotations', icon: "fa fa-fw fa-comment-o"}, - {title: 'Variables', id: 'templating', icon: "fa fa-fw fa-dollar"}, - {title: 'Links', id: 'links', icon: "fa fa-fw fa-external-link"}, - {title: 'Versions', id: 'versions', icon: "fa fa-fw fa-history"}, - {title: 'View JSON', id: 'view_json', icon: "fa fa-fw fa-code"}, - {title: 'Save As', id: 'save_as', icon: "fa fa-fw fa-copy"}, - {title: 'Delete', id: 'delete', icon: "fa fa-fw fa-trash"}, - ]; + sections: any[]; /** @ngInject */ constructor(private $scope, private $location, private $rootScope, private backendSrv, private dashboardSrv) { @@ -29,17 +19,9 @@ export class SettingsCtrl { // that rely on inherited scope $scope.dashboard = this.dashboard; - const params = this.$location.search(); - const url = $location.path(); - - for (let section of this.sections) { - const sectionParams = _.defaults({editview: section.id}, params); - section.url = url + '?' + $.param(sectionParams); - } - this.$scope.$on('$destroy', () => { this.dashboard.updateSubmenuVisibility(); - this.$rootScope.$broadcast("refresh"); + this.$rootScope.$broadcast('refresh'); }); this.alertCount = _.sumBy(this.dashboard.panels, panel => { @@ -47,9 +29,54 @@ export class SettingsCtrl { }); this.confirmValid = this.alertCount === 0; - this.onRouteUpdated(); - $rootScope.onAppEvent("$routeUpdate", this.onRouteUpdated.bind(this), $scope); + this.buildSectionList(); + + $rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope); + } + + buildSectionList() { + this.sections = []; + if (this.dashboard.meta.canEdit) { + this.sections.push({ title: 'General', id: 'settings', icon: 'fa fa-fw fa-sliders' }); + this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'fa fa-fw fa-comment-o' }); + this.sections.push({ title: 'Variables', id: 'templating', icon: 'fa fa-fw fa-dollar' }); + this.sections.push({ title: 'Links', id: 'links', icon: 'fa fa-fw fa-external-link' }); + + if (this.dashboard.id) { + this.sections.push({ title: 'Versions', id: 'versions', icon: 'fa fa-fw fa-history' }); + } + } + + if (contextSrv.isEditor && !this.dashboard.editable) { + this.sections.push({ title: 'Make Editable', icon: 'fa fa-fw fa-edit', id: 'make_editable' }); + this.viewId = 'make_editable'; + } + + this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'fa fa-fw fa-code' }); + + if (contextSrv.isEditor) { + this.sections.push({ title: 'Save As', id: 'save_as', icon: 'fa fa-fw fa-copy' }); + } + + if (this.dashboard.meta.canSave) { + this.sections.push({ title: 'Delete', id: 'delete', icon: 'fa fa-fw fa-trash' }); + } + + const params = this.$location.search(); + const url = this.$location.path(); + + for (let section of this.sections) { + const sectionParams = _.defaults({ editview: section.id }, params); + section.url = url + '?' + $.param(sectionParams); + } + + const currentSection = _.find(this.sections, { id: this.viewId }); + if (!currentSection) { + this.sections.unshift({ title: 'Not found', id: '404', icon: 'fa fa-fw fa-warning' }); + this.viewId = '404'; + return; + } } onRouteUpdated() { @@ -73,14 +100,14 @@ export class SettingsCtrl { makeEditable() { this.dashboard.editable = true; - return this.dashboardSrv.saveDashboard({makeEditable: true, overwrite: false}).then(() => { + return this.dashboardSrv.saveDashboard({ makeEditable: true, overwrite: false }).then(() => { // force refresh whole page window.location.href = window.location.href; }); } confirmTextChanged() { - this.confirmValid = this.confirmText === "DELETE"; + this.confirmValid = this.confirmText === 'DELETE'; } deleteDashboard() { @@ -93,7 +120,7 @@ export class SettingsCtrl { onFolderChange(folder) { this.dashboard.folderId = folder.id; this.dashboard.meta.folderId = folder.id; - this.dashboard.meta.folderTitle= folder.title; + this.dashboard.meta.folderTitle = folder.title; } } @@ -105,7 +132,7 @@ export function dashboardSettings() { bindToController: true, controllerAs: 'ctrl', transclude: true, - scope: { dashboard: "=" } + scope: { dashboard: '=' }, }; } diff --git a/public/app/partials/confirm_modal.html b/public/app/partials/confirm_modal.html index 0b706788e90..d0b0d260f78 100644 --- a/public/app/partials/confirm_modal.html +++ b/public/app/partials/confirm_modal.html @@ -21,7 +21,6 @@
    -
    From 26281dd9d8995b39be3b6316b23cb64c48c11f31 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 11 Dec 2017 19:46:05 +0300 Subject: [PATCH 68/89] refactor: format files by gofmt --- pkg/api/dashboard_acl.go | 2 +- pkg/api/dashboard_acl_test.go | 2 +- pkg/api/dtos/acl.go | 8 ++++---- pkg/models/dashboard_acl.go | 14 ++++++------- pkg/models/team.go | 10 +++++----- pkg/models/team_member.go | 22 ++++++++++----------- pkg/services/sqlstore/dashboard_acl.go | 2 +- pkg/services/sqlstore/dashboard_acl_test.go | 4 ++-- pkg/services/sqlstore/team.go | 10 +++++----- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pkg/api/dashboard_acl.go b/pkg/api/dashboard_acl.go index c40d6b767f7..88cc74b9d1c 100644 --- a/pkg/api/dashboard_acl.go +++ b/pkg/api/dashboard_acl.go @@ -43,7 +43,7 @@ func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCom OrgId: c.OrgId, DashboardId: dashId, UserId: item.UserId, - TeamId: item.TeamId, + TeamId: item.TeamId, Role: item.Role, Permission: item.Permission, Created: time.Now(), diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go index 82fb6244a23..e22e625dcf9 100644 --- a/pkg/api/dashboard_acl_test.go +++ b/pkg/api/dashboard_acl_test.go @@ -165,7 +165,7 @@ func transformDashboardAclsToDTOs(acls []*m.DashboardAclInfoDTO) []*m.DashboardA DashboardId: acl.DashboardId, Permission: acl.Permission, UserId: acl.UserId, - TeamId: acl.TeamId, + TeamId: acl.TeamId, } dtos = append(dtos, dto) } diff --git a/pkg/api/dtos/acl.go b/pkg/api/dtos/acl.go index 9a481c02f1a..6c74e68ce0d 100644 --- a/pkg/api/dtos/acl.go +++ b/pkg/api/dtos/acl.go @@ -9,8 +9,8 @@ type UpdateDashboardAclCommand struct { } type DashboardAclUpdateItem struct { - UserId int64 `json:"userId"` - TeamId int64 `json:"teamId"` - Role *m.RoleType `json:"role,omitempty"` - Permission m.PermissionType `json:"permission"` + UserId int64 `json:"userId"` + TeamId int64 `json:"teamId"` + Role *m.RoleType `json:"role,omitempty"` + Permission m.PermissionType `json:"permission"` } diff --git a/pkg/models/dashboard_acl.go b/pkg/models/dashboard_acl.go index 601cc16c80c..fa7ad00de7f 100644 --- a/pkg/models/dashboard_acl.go +++ b/pkg/models/dashboard_acl.go @@ -34,10 +34,10 @@ type DashboardAcl struct { OrgId int64 DashboardId int64 - UserId int64 - TeamId int64 - Role *RoleType // pointer to be nullable - Permission PermissionType + UserId int64 + TeamId int64 + Role *RoleType // pointer to be nullable + Permission PermissionType Created time.Time Updated time.Time @@ -54,8 +54,8 @@ type DashboardAclInfoDTO struct { UserId int64 `json:"userId"` UserLogin string `json:"userLogin"` UserEmail string `json:"userEmail"` - TeamId int64 `json:"teamId"` - Team string `json:"team"` + TeamId int64 `json:"teamId"` + Team string `json:"team"` Role *RoleType `json:"role,omitempty"` Permission PermissionType `json:"permission"` PermissionName string `json:"permissionName"` @@ -74,7 +74,7 @@ type SetDashboardAclCommand struct { DashboardId int64 OrgId int64 UserId int64 - TeamId int64 + TeamId int64 Permission PermissionType Result DashboardAcl diff --git a/pkg/models/team.go b/pkg/models/team.go index 7de69b9c133..a8f53e81a1e 100644 --- a/pkg/models/team.go +++ b/pkg/models/team.go @@ -46,7 +46,7 @@ type GetTeamByIdQuery struct { } type GetTeamsByUserQuery struct { - UserId int64 `json:"userId"` + UserId int64 `json:"userId"` Result []*Team `json:"teams"` } @@ -61,8 +61,8 @@ type SearchTeamsQuery struct { } type SearchTeamQueryResult struct { - TotalCount int64 `json:"totalCount"` - Teams []*Team `json:"teams"` - Page int `json:"page"` - PerPage int `json:"perPage"` + TotalCount int64 `json:"totalCount"` + Teams []*Team `json:"teams"` + Page int `json:"page"` + PerPage int `json:"perPage"` } diff --git a/pkg/models/team_member.go b/pkg/models/team_member.go index d2c646b0893..71e5cd4ba12 100644 --- a/pkg/models/team_member.go +++ b/pkg/models/team_member.go @@ -12,10 +12,10 @@ var ( // TeamMember model type TeamMember struct { - Id int64 - OrgId int64 + Id int64 + OrgId int64 TeamId int64 - UserId int64 + UserId int64 Created time.Time Updated time.Time @@ -25,13 +25,13 @@ type TeamMember struct { // COMMANDS type AddTeamMemberCommand struct { - UserId int64 `json:"userId" binding:"Required"` - OrgId int64 `json:"-"` + UserId int64 `json:"userId" binding:"Required"` + OrgId int64 `json:"-"` TeamId int64 `json:"-"` } type RemoveTeamMemberCommand struct { - UserId int64 + UserId int64 TeamId int64 } @@ -40,16 +40,16 @@ type RemoveTeamMemberCommand struct { type GetTeamMembersQuery struct { TeamId int64 - Result []*TeamMemberDTO + Result []*TeamMemberDTO } // ---------------------- // Projections and DTOs type TeamMemberDTO struct { - OrgId int64 `json:"orgId"` + OrgId int64 `json:"orgId"` TeamId int64 `json:"teamId"` - UserId int64 `json:"userId"` - Email string `json:"email"` - Login string `json:"login"` + UserId int64 `json:"userId"` + Email string `json:"email"` + Login string `json:"login"` } diff --git a/pkg/services/sqlstore/dashboard_acl.go b/pkg/services/sqlstore/dashboard_acl.go index cb4ded42f66..3ab0361d175 100644 --- a/pkg/services/sqlstore/dashboard_acl.go +++ b/pkg/services/sqlstore/dashboard_acl.go @@ -75,7 +75,7 @@ func SetDashboardAcl(cmd *m.SetDashboardAclCommand) error { entity := m.DashboardAcl{ OrgId: cmd.OrgId, - TeamId: cmd.TeamId, + TeamId: cmd.TeamId, UserId: cmd.UserId, Created: time.Now(), Updated: time.Now(), diff --git a/pkg/services/sqlstore/dashboard_acl_test.go b/pkg/services/sqlstore/dashboard_acl_test.go index aa8e8ab13bf..bb6363883d6 100644 --- a/pkg/services/sqlstore/dashboard_acl_test.go +++ b/pkg/services/sqlstore/dashboard_acl_test.go @@ -183,7 +183,7 @@ func TestDashboardAclDataAccess(t *testing.T) { Convey("Should be able to add a user permission for a team", func() { setDashAclCmd := m.SetDashboardAclCommand{ OrgId: 1, - TeamId: group1.Result.Id, + TeamId: group1.Result.Id, DashboardId: savedFolder.Id, Permission: m.PERMISSION_EDIT, } @@ -215,7 +215,7 @@ func TestDashboardAclDataAccess(t *testing.T) { Convey("Should be able to update an existing permission for a team", func() { err := SetDashboardAcl(&m.SetDashboardAclCommand{ OrgId: 1, - TeamId: group1.Result.Id, + TeamId: group1.Result.Id, DashboardId: savedFolder.Id, Permission: m.PERMISSION_ADMIN, }) diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go index 252bb39cef0..2bc04bad0c6 100644 --- a/pkg/services/sqlstore/team.go +++ b/pkg/services/sqlstore/team.go @@ -196,11 +196,11 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error { } entity := m.TeamMember{ - OrgId: cmd.OrgId, - TeamId: cmd.TeamId, - UserId: cmd.UserId, - Created: time.Now(), - Updated: time.Now(), + OrgId: cmd.OrgId, + TeamId: cmd.TeamId, + UserId: cmd.UserId, + Created: time.Now(), + Updated: time.Now(), } _, err := sess.Insert(&entity) From 79d9b64f82f2e86f23f5e84d4de0d66a716301c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 11:00:16 +0100 Subject: [PATCH 69/89] fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161 --- public/app/features/dashboard/all.ts | 2 +- public/app/features/dashboard/dashgrid/DashboardGrid.tsx | 4 ---- .../app/features/dashboard/dashgrid/DashboardGridDirective.ts | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 public/app/features/dashboard/dashgrid/DashboardGridDirective.ts diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts index f21338f5d6a..50c83803471 100644 --- a/public/app/features/dashboard/all.ts +++ b/public/app/features/dashboard/all.ts @@ -19,7 +19,7 @@ import './export/export_modal'; import './export_data/export_data_modal'; import './ad_hoc_filters'; import './repeat_option/repeat_option'; -import './dashgrid/DashboardGrid'; +import './dashgrid/DashboardGridDirective'; import './dashgrid/PanelLoader'; import './dashgrid/RowOptions'; import './acl/acl'; diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx index 7b0f040e199..c640e06cc9b 100644 --- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx +++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import coreModule from 'app/core/core_module'; import ReactGridLayout from 'react-grid-layout'; import {GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT} from 'app/core/constants'; import {DashboardPanel} from './DashboardPanel'; @@ -174,6 +173,3 @@ export class DashboardGrid extends React.Component { } } -coreModule.directive('dashboardGrid', function(reactDirective) { - return reactDirective(DashboardGrid, [['getPanelContainer', {watchDepth: 'reference', wrapApply: false}]]); -}); diff --git a/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts b/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts new file mode 100644 index 00000000000..84a0e0653e8 --- /dev/null +++ b/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts @@ -0,0 +1,4 @@ +import { react2AngularDirective } from 'app/core/utils/react2angular'; +import { DashboardGrid } from './DashboardGrid'; + +react2AngularDirective('dashboardGrid', DashboardGrid, [['getPanelContainer', {watchDepth: 'reference', wrapApply: false}]]); From c68e7c72835a0214bf49ecd93ef25c043ec861a4 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 7 Dec 2017 17:59:39 +0100 Subject: [PATCH 70/89] avatar: avoid concurrent map writes --- pkg/api/avatar/avatar.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go index fdf93d06b5d..6824e330f00 100644 --- a/pkg/api/avatar/avatar.go +++ b/pkg/api/avatar/avatar.go @@ -25,6 +25,8 @@ import ( "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/setting" "gopkg.in/macaron.v1" + + gocache "github.com/patrickmn/go-cache" ) var gravatarSource string @@ -92,7 +94,7 @@ func (this *Avatar) Update() (err error) { type CacheServer struct { notFound *Avatar - cache map[string]*Avatar + cache *gocache.Cache } func (this *CacheServer) mustInt(r *http.Request, defaultValue int, keys ...string) (v int) { @@ -110,7 +112,9 @@ func (this *CacheServer) Handler(ctx *macaron.Context) { var avatar *Avatar - if avatar, _ = this.cache[hash]; avatar == nil { + if obj, exist := this.cache.Get(hash); exist { + avatar = obj.(*Avatar) + } else { avatar = New(hash) } @@ -124,7 +128,7 @@ func (this *CacheServer) Handler(ctx *macaron.Context) { if avatar.notFound { avatar = this.notFound } else { - this.cache[hash] = avatar + this.cache.Add(hash, avatar, gocache.DefaultExpiration) } ctx.Resp.Header().Add("Content-Type", "image/jpeg") @@ -146,7 +150,7 @@ func NewCacheServer() *CacheServer { return &CacheServer{ notFound: newNotFound(), - cache: make(map[string]*Avatar), + cache: gocache.New(time.Hour, time.Hour*2), } } From 515faa9ec547b6e7ed76ea0e125a2f1d1fea28ee Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Tue, 12 Dec 2017 11:26:15 +0100 Subject: [PATCH 71/89] new dashboard and folder in search (#10152) * new dashboard and folder in search * code formatting fixes --- public/app/core/components/search/search.html | 8 ++++++++ public/sass/components/_search.scss | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index f9b953efcee..1522227c54c 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -55,6 +55,14 @@
    + + + Dashboard + + + + Folder + Find dashboards on Grafana.com diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 6c23f51aaa0..6c1048c5cd4 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -83,6 +83,14 @@ margin-bottom: $spacer * 1.5; } +.search-filter-box-item { + display:block; + margin-bottom: 16px; + i { + font-size: 20px; + } +} + .search-results-container { height: 100%; display: block; From 0a8bd5d289e866b5326ea2f7a4c4c7496e83ec73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 11:49:01 +0100 Subject: [PATCH 72/89] ux: dashboard settings updated --- .../app/core/components/dashboard_selector.ts | 2 - public/app/features/dashboard/all.ts | 2 +- .../features/dashboard/dashboard_save_as.ts | 81 ------------ .../app/features/dashboard/save_as_modal.ts | 93 ++++++++++++++ .../features/dashboard/settings/settings.html | 120 +++++++++--------- .../features/dashboard/settings/settings.ts | 65 ++++++---- ..._save_as.jest.ts => save_as_modal.jest.ts} | 4 +- .../sass/components/_dashboard_settings.scss | 12 ++ 8 files changed, 206 insertions(+), 173 deletions(-) delete mode 100644 public/app/features/dashboard/dashboard_save_as.ts create mode 100644 public/app/features/dashboard/save_as_modal.ts rename public/app/features/dashboard/specs/{dashboard_save_as.jest.ts => save_as_modal.jest.ts} (92%) diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts index 7ec9f681520..ac8b30e7733 100644 --- a/public/app/core/components/dashboard_selector.ts +++ b/public/app/core/components/dashboard_selector.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; var template = ` diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts index eb61ca6aa11..4c7e6058984 100644 --- a/public/app/features/dashboard/all.ts +++ b/public/app/features/dashboard/all.ts @@ -4,7 +4,7 @@ import './history/history'; import './dashboardLoaderSrv'; import './dashnav/dashnav'; import './submenu/submenu'; -import './dashboard_save_as'; +import './save_as_modal'; import './save_modal'; import './shareModalCtrl'; import './shareSnapshotCtrl'; diff --git a/public/app/features/dashboard/dashboard_save_as.ts b/public/app/features/dashboard/dashboard_save_as.ts deleted file mode 100644 index 5ce487587e4..00000000000 --- a/public/app/features/dashboard/dashboard_save_as.ts +++ /dev/null @@ -1,81 +0,0 @@ -import coreModule from 'app/core/core_module'; - -const template = ` -

    Save As

    - -
    -
    -
    - - -
    -
    - - -
    -
    - -
    - -
    -
    -`; - -export class SaveDashboardAsCtrl { - clone: any; - folderId: any; - dismiss: () => void; - - /** @ngInject */ - constructor(private dashboardSrv) { - var dashboard = this.dashboardSrv.getCurrent(); - this.clone = dashboard.getSaveModelClone(); - this.clone.id = null; - this.clone.title += ' Copy'; - this.clone.editable = true; - this.clone.hideControls = false; - this.folderId = dashboard.folderId; - - // remove alerts if source dashboard is already persisted - // do not want to create alert dupes - if (dashboard.id > 0) { - this.clone.panels.forEach(panel => { - if (panel.type === "graph" && panel.alert) { - delete panel.thresholds; - } - delete panel.alert; - }); - } - - delete this.clone.autoUpdate; - } - - save() { - return this.dashboardSrv.save(this.clone).then(this.dismiss); - } - - keyDown(evt) { - if (evt.keyCode === 13) { - this.save(); - } - } - - onFolderChange(folder) { - this.clone.folderId = folder.id; - } -} - -export function saveDashboardAsDirective() { - return { - restrict: 'E', - template: template, - controller: SaveDashboardAsCtrl, - bindToController: true, - controllerAs: 'ctrl', - scope: {} - }; -} - -coreModule.directive('saveDashboardAs', saveDashboardAsDirective); diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts new file mode 100644 index 00000000000..d69b64f1960 --- /dev/null +++ b/public/app/features/dashboard/save_as_modal.ts @@ -0,0 +1,93 @@ +import coreModule from 'app/core/core_module'; + +const template = ` +
    +
    +

    + + Save As... +

    + + + + +
    + +
    +
    +
    + + +
    +
    + + +
    +
    + +
    + + Cancel +
    +
    +
    +`; + +export class SaveDashboardAsModalCtrl { + clone: any; + folderId: any; + dismiss: () => void; + + /** @ngInject */ + constructor(private dashboardSrv) { + var dashboard = this.dashboardSrv.getCurrent(); + this.clone = dashboard.getSaveModelClone(); + this.clone.id = null; + this.clone.title += ' Copy'; + this.clone.editable = true; + this.clone.hideControls = false; + this.folderId = dashboard.folderId; + + // remove alerts if source dashboard is already persisted + // do not want to create alert dupes + if (dashboard.id > 0) { + this.clone.panels.forEach(panel => { + if (panel.type === "graph" && panel.alert) { + delete panel.thresholds; + } + delete panel.alert; + }); + } + + delete this.clone.autoUpdate; + } + + save() { + return this.dashboardSrv.save(this.clone).then(this.dismiss); + } + + keyDown(evt) { + if (evt.keyCode === 13) { + this.save(); + } + } + + onFolderChange(folder) { + this.clone.folderId = folder.id; + } +} + +export function saveDashboardAsDirective() { + return { + restrict: 'E', + template: template, + controller: SaveDashboardAsModalCtrl, + bindToController: true, + controllerAs: 'ctrl', + scope: {dismiss: "&"} + }; +} + +coreModule.directive('saveDashboardAsModal', saveDashboardAsDirective); diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 76a297c50ee..7de5e2dbcd1 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -8,53 +8,65 @@ {{::section.title}} + +
    + + + +
    -

    - General -

    +

    + General +

    -
    -
    - - -
    -
    - - -
    -
    - - - -
    - - - - -
    +
    +
    + + +
    +
    + + +
    +
    + + + +
    + + + + +
    - + -
    Panel Options
    -
    - -
    - -
    -
    +
    Panel Options
    +
    + +
    + +
    +
    @@ -72,29 +84,11 @@
    -

    View JSON

    +

    View JSON

    -
    - -
    -
    - -
    - -
    - -
    -

    Delete dashboard

    - -
    -
    This dashboard contains {{ctrl.alertCount}} alerts. Deleting this dashboard will also delete those alerts
    - -
    - - +
    + +
    diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index d19165e832f..87ac91d568b 100644 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -9,8 +9,8 @@ export class SettingsCtrl { viewId: string; json: string; alertCount: number; - confirmValid: boolean; - confirmText: string; + canSaveAs: boolean; + canDelete: boolean; sections: any[]; /** @ngInject */ @@ -24,13 +24,11 @@ export class SettingsCtrl { this.$rootScope.$broadcast('refresh'); }); - this.alertCount = _.sumBy(this.dashboard.panels, panel => { - return panel.alert ? 1 : 0; - }); + this.canSaveAs = contextSrv.isEditor; + this.canDelete = this.dashboard.meta.canSave; - this.confirmValid = this.alertCount === 0; - this.onRouteUpdated(); this.buildSectionList(); + this.onRouteUpdated(); $rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope); } @@ -55,14 +53,6 @@ export class SettingsCtrl { this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'fa fa-fw fa-code' }); - if (contextSrv.isEditor) { - this.sections.push({ title: 'Save As', id: 'save_as', icon: 'fa fa-fw fa-copy' }); - } - - if (this.dashboard.meta.canSave) { - this.sections.push({ title: 'Delete', id: 'delete', icon: 'fa fa-fw fa-trash' }); - } - const params = this.$location.search(); const url = this.$location.path(); @@ -70,6 +60,14 @@ export class SettingsCtrl { const sectionParams = _.defaults({ editview: section.id }, params); section.url = url + '?' + $.param(sectionParams); } + } + + onRouteUpdated() { + this.viewId = this.$location.search().editview; + + if (this.viewId) { + this.json = JSON.stringify(this.dashboard.getSaveModelClone(), null, 2); + } const currentSection = _.find(this.sections, { id: this.viewId }); if (!currentSection) { @@ -79,12 +77,8 @@ export class SettingsCtrl { } } - onRouteUpdated() { - this.viewId = this.$location.search().editview; - - if (this.viewId) { - this.json = JSON.stringify(this.dashboard.getSaveModelClone(), null, 2); - } + openSaveAsModal() { + this.dashboardSrv.showSaveAsModal(); } hideSettings() { @@ -106,11 +100,34 @@ export class SettingsCtrl { }); } - confirmTextChanged() { - this.confirmValid = this.confirmText === 'DELETE'; + deleteDashboard() { + var confirmText = ''; + var text2 = this.dashboard.title; + + const alerts = _.sumBy(this.dashboard.panels, panel => { + return panel.alert ? 1 : 0; + }); + + if (alerts > 0) { + confirmText = 'DELETE'; + text2 = `This dashboard contains ${alerts} alerts. Deleting this dashboard will also delete those alerts`; + } + + appEvents.emit('confirm-modal', { + title: 'Delete', + text: 'Do you want to delete this dashboard?', + text2: text2, + icon: 'fa-trash', + confirmText: confirmText, + yesText: 'Delete', + onConfirm: () => { + this.dashboard.meta.canSave = false; + this.deleteDashboardConfirmed(); + } + }); } - deleteDashboard() { + deleteDashboardConfirmed() { this.backendSrv.delete('/api/dashboards/db/' + this.dashboard.meta.slug).then(() => { appEvents.emit('alert-success', ['Dashboard Deleted', this.dashboard.title + ' has been deleted']); this.$location.url('/'); diff --git a/public/app/features/dashboard/specs/dashboard_save_as.jest.ts b/public/app/features/dashboard/specs/save_as_modal.jest.ts similarity index 92% rename from public/app/features/dashboard/specs/dashboard_save_as.jest.ts rename to public/app/features/dashboard/specs/save_as_modal.jest.ts index 21d0fafd6ae..9155f59ca70 100644 --- a/public/app/features/dashboard/specs/dashboard_save_as.jest.ts +++ b/public/app/features/dashboard/specs/save_as_modal.jest.ts @@ -1,4 +1,4 @@ -import { SaveDashboardAsCtrl } from '../dashboard_save_as'; +import { SaveDashboardAsModalCtrl } from '../save_as_modal; import { describe, it, expect } from 'test/lib/common'; describe('saving dashboard as', () => { @@ -21,7 +21,7 @@ describe('saving dashboard as', () => { }, }; - var ctrl = new SaveDashboardAsCtrl(mockDashboardSrv); + var ctrl = new SaveDashboardAsModalCtrl(mockDashboardSrv); var ctx: any = { clone: ctrl.clone, ctrl: ctrl, diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss index bb22e6af89e..9e307c07231 100644 --- a/public/sass/components/_dashboard_settings.scss +++ b/public/sass/components/_dashboard_settings.scss @@ -67,3 +67,15 @@ padding-right: 5px; } } + +.dashboard-settings__aside-actions { + display: flex; + flex-direction: column; + height: 100%; + flex-grow: 1; + margin: $spacer*3 $spacer*2 0 0; + + button { + margin-bottom: 10px; + } +} From 7b0bbefb96456b0eef97d1e86bcb42415ee66209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 12:02:44 +0100 Subject: [PATCH 73/89] ux: minor updates to dashboard settings --- public/app/features/dashboard/history/history.html | 2 +- public/app/features/dashboard/history/history.ts | 2 -- public/app/features/dashboard/settings/settings.html | 2 +- public/sass/components/_dashboard_settings.scss | 1 - public/sass/components/_gf-form.scss | 11 ++++++++--- public/sass/components/_query_editor.scss | 4 ++++ 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html index c79853e5613..48caddeb90e 100644 --- a/public/app/features/dashboard/history/history.html +++ b/public/app/features/dashboard/history/history.html @@ -1,5 +1,5 @@

    - Version History + Versions > Comparing {{ctrl.baseInfo.version}} diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/history/history.ts index b0dee045a6a..05e78d08989 100644 --- a/public/app/features/dashboard/history/history.ts +++ b/public/app/features/dashboard/history/history.ts @@ -1,5 +1,3 @@ -/// - import './history_srv'; import _ from 'lodash'; diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 7de5e2dbcd1..e78dcb74127 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -23,7 +23,7 @@
    -

    +

    General

    diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss index 9e307c07231..50f157a5a15 100644 --- a/public/sass/components/_dashboard_settings.scss +++ b/public/sass/components/_dashboard_settings.scss @@ -35,7 +35,6 @@ .dashboard-settings__aside-header { color: $text-muted; font-size: $font-size-h3; - margin-bottom: 20px; padding-right: 60px; white-space: nowrap; diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 1174d307ff2..5ee712b0810 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -85,6 +85,14 @@ $input-border: 1px solid $input-border-color; } } +.gf-form-label + .gf-form-label { + margin-right: $gf-form-margin; +} + +.gf-form + .gf-form { + margin-right: $gf-form-margin; +} + .gf-form-pre { display: block; flex-grow: 1; @@ -254,9 +262,6 @@ $input-border: 1px solid $input-border-color; margin-right: $gf-form-margin; line-height: $input-line-height; font-size: $font-size-sm; - box-shadow: none; - @include border-radius($label-border-radius-sm); - border: $input-btn-border-width solid transparent; flex-shrink: 0; flex-grow: 0; diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss index cd8f949ed64..66c029071b2 100644 --- a/public/sass/components/_query_editor.scss +++ b/public/sass/components/_query_editor.scss @@ -33,6 +33,10 @@ .gf-form-label { margin-right: 2px; } + + .gf-form + .gf-form { + margin-right: 0; + } } .gf-form-query-content { From 86204abbfe9abc14141cac72026c40b19214fd41 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 Dec 2017 14:04:08 +0300 Subject: [PATCH 74/89] Move panel JSON editor to modal dialog (#10156) * panel: fix JSON edit, #10149 * panel: show JSON editor in modal, #10149 --- public/app/features/panel/panel_ctrl.ts | 29 ++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index 4655ff19282..0eff9ad43db 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -2,6 +2,7 @@ import config from 'app/core/config'; import _ from 'lodash'; import $ from 'jquery'; import {appEvents, profiler} from 'app/core/core'; +import { PanelModel } from 'app/features/dashboard/panel_model'; import Remarkable from 'remarkable'; import {GRID_CELL_HEIGHT, GRID_CELL_VMARGIN} from 'app/core/constants'; @@ -190,8 +191,9 @@ export class PanelCtrl { duplicate() { this.dashboard.duplicatePanel(this.panel); + let self = this; this.$timeout(() => { - this.$scope.$root.$broadcast('render'); + self.$scope.$root.$broadcast('render'); }); } @@ -223,21 +225,32 @@ export class PanelCtrl { } editPanelJson() { - this.publishAppEvent('show-json-editor', { - object: this.panel.getSaveModel(), - updateHandler: this.replacePanel.bind(this) + let editScope = this.$scope.$root.$new(); + editScope.object = this.panel.getSaveModel(); + editScope.updateHandler = this.replacePanel.bind(this); + + this.publishAppEvent('show-modal', { + src: 'public/app/partials/edit_json.html', + scope: editScope }); } replacePanel(newPanel, oldPanel) { - var index = _.indexOf(this.dashboard.panels, oldPanel); - this.dashboard.panels.splice(index, 1); + let dashboard = this.dashboard; + let index = _.findIndex(dashboard.panels, (panel) => { + return panel.id === oldPanel.id; + }); + let deletedPanel = dashboard.panels.splice(index, 1); + this.dashboard.events.emit('panel-removed', deletedPanel); // adding it back needs to be done in next digest this.$timeout(() => { + newPanel = new PanelModel(newPanel); newPanel.id = oldPanel.id; - newPanel.width = oldPanel.width; - this.dashboard.panels.splice(index, 0, newPanel); + + dashboard.panels.splice(index, 0, newPanel); + dashboard.sortPanelsByGridPos(); + dashboard.events.emit('panel-added', newPanel); }); } From 35c8cdf3a55c76ecc81fa749833c1d3b4c065c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 12:10:19 +0100 Subject: [PATCH 75/89] refactor: minor change to panel json fix PR #10156 --- public/app/features/panel/panel_ctrl.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index 0eff9ad43db..695beee307b 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -191,9 +191,8 @@ export class PanelCtrl { duplicate() { this.dashboard.duplicatePanel(this.panel); - let self = this; this.$timeout(() => { - self.$scope.$root.$broadcast('render'); + this.$scope.$root.$broadcast('render'); }); } @@ -240,18 +239,16 @@ export class PanelCtrl { let index = _.findIndex(dashboard.panels, (panel) => { return panel.id === oldPanel.id; }); + let deletedPanel = dashboard.panels.splice(index, 1); this.dashboard.events.emit('panel-removed', deletedPanel); - // adding it back needs to be done in next digest - this.$timeout(() => { - newPanel = new PanelModel(newPanel); - newPanel.id = oldPanel.id; + newPanel = new PanelModel(newPanel); + newPanel.id = oldPanel.id; - dashboard.panels.splice(index, 0, newPanel); - dashboard.sortPanelsByGridPos(); - dashboard.events.emit('panel-added', newPanel); - }); + dashboard.panels.splice(index, 0, newPanel); + dashboard.sortPanelsByGridPos(); + dashboard.events.emit('panel-added', newPanel); } sharePanel() { From e98f573732638f732cdae4343a0113833d22277c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 12:31:41 +0100 Subject: [PATCH 76/89] build: fixed broken test --- public/app/core/components/search/search.html | 4 ++-- public/app/features/dashboard/specs/save_as_modal.jest.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 1522227c54c..a7d578f0193 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -55,11 +55,11 @@
    - + Dashboard - + Folder diff --git a/public/app/features/dashboard/specs/save_as_modal.jest.ts b/public/app/features/dashboard/specs/save_as_modal.jest.ts index 9155f59ca70..b2ab77f2255 100644 --- a/public/app/features/dashboard/specs/save_as_modal.jest.ts +++ b/public/app/features/dashboard/specs/save_as_modal.jest.ts @@ -1,4 +1,4 @@ -import { SaveDashboardAsModalCtrl } from '../save_as_modal; +import { SaveDashboardAsModalCtrl } from '../save_as_modal'; import { describe, it, expect } from 'test/lib/common'; describe('saving dashboard as', () => { From 871b98c06b4b14f3a80e58fe36adffc9f5602b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 12:56:40 +0100 Subject: [PATCH 77/89] graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path --- public/app/plugins/datasource/graphite/graphite_query.ts | 4 ++++ public/app/plugins/datasource/graphite/query_ctrl.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts index 54504219dad..824b49f8860 100644 --- a/public/app/plugins/datasource/graphite/graphite_query.ts +++ b/public/app/plugins/datasource/graphite/graphite_query.ts @@ -120,6 +120,10 @@ export default class GraphiteQuery { this.segments.push({value: "select metric"}); } + hasSelectMetric() { + return this.segments[this.segments.length - 1].value === 'select metric'; + } + addFunction(newFunc) { this.functions.push(newFunc); this.moveAliasFuncLast(); diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts index d00ac90fe65..a2e54903bcb 100644 --- a/public/app/plugins/datasource/graphite/query_ctrl.ts +++ b/public/app/plugins/datasource/graphite/query_ctrl.ts @@ -218,7 +218,7 @@ export class GraphiteQueryCtrl extends QueryCtrl { var oldTarget = this.queryModel.target.target; this.updateModelTarget(); - if (this.queryModel.target !== oldTarget) { + if (this.queryModel.target !== oldTarget && !this.queryModel.hasSelectMetric()) { this.panelCtrl.refresh(); } } From ff1b71bc20cc0981a38deaf6f2260c3ad6aab3f9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 12 Dec 2017 13:18:00 +0100 Subject: [PATCH 78/89] allow overriding dashboards from api --- pkg/api/dashboard.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 92d4a13d39e..4d2ed4707d9 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -139,6 +139,7 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { Message: cmd.Message, OrgId: c.OrgId, UserId: c.UserId, + Overwrite: cmd.Overwrite, } dashboard, err := dashboards.GetRepository().SaveDashboard(dashItem) From a00af85f36e53be6824e6c21652f45de122861cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 13:21:50 +0100 Subject: [PATCH 79/89] build: fixed unit test failure --- public/app/plugins/datasource/graphite/graphite_query.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts index 824b49f8860..a1c4a889efb 100644 --- a/public/app/plugins/datasource/graphite/graphite_query.ts +++ b/public/app/plugins/datasource/graphite/graphite_query.ts @@ -121,7 +121,11 @@ export default class GraphiteQuery { } hasSelectMetric() { - return this.segments[this.segments.length - 1].value === 'select metric'; + if (this.segments.length > 0) { + return this.segments[this.segments.length - 1].value === 'select metric'; + } else { + return false; + } } addFunction(newFunc) { From df25c9f0fa06d0c5b9c97454141d6d1d22dbeac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 13:27:56 +0100 Subject: [PATCH 80/89] tech: updated version for react-grid item --- package.json | 2 +- public/sass/components/_dashboard_settings.scss | 2 +- yarn.lock | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 59608e80403..5516ad97fd7 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "prop-types": "^15.6.0", "react": "^16.1.1", "react-dom": "^16.1.1", - "react-grid-layout": "^0.16.0", + "react-grid-layout": "^0.16.1", "react-sizeme": "^2.3.6", "remarkable": "^1.7.1", "rxjs": "^5.4.3", diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss index 50f157a5a15..762e1202bc5 100644 --- a/public/sass/components/_dashboard_settings.scss +++ b/public/sass/components/_dashboard_settings.scss @@ -37,6 +37,7 @@ font-size: $font-size-h3; padding-right: 60px; white-space: nowrap; + margin-bottom: $spacer; i { font-size: 25px; @@ -48,7 +49,6 @@ .dashboard-settings__header { font-size: $font-size-h3; - margin-bottom: 20px; } .dashboard-settings__nav-item { diff --git a/yarn.lock b/yarn.lock index 7cdb57448ef..9ce16177ee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6447,10 +6447,6 @@ ng-annotate@^1.2.1: stringset "~0.2.1" tryor "~0.1.2" -ngreact@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/ngreact/-/ngreact-0.4.1.tgz#53d8f0db7c687c6daa340827a5ef04a903c14701" - ngtemplate-loader@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ngtemplate-loader/-/ngtemplate-loader-2.0.1.tgz#9d7ed2e8a2363523ad7b64d74aac402d8daff3f3" @@ -7942,9 +7938,9 @@ react-dom@^16.1.1: classnames "^2.2.5" prop-types "^15.5.10" -react-grid-layout@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.0.tgz#f74363cd134b2f8a763224d7b6287cbb68e6de05" +react-grid-layout@^0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.1.tgz#45eb5687da2ae6912b63c1c0b79b7fb6bbd32202" dependencies: classnames "2.x" lodash.isequal "^4.0.0" From d379b501aa53c3ab70483224cd1217c14f2adc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 13:55:32 +0100 Subject: [PATCH 81/89] ux: search look update --- public/app/features/dashboard/settings/settings.html | 2 +- public/sass/components/_dashboard_settings.scss | 1 + public/sass/components/_search.scss | 9 ++++----- public/sass/components/_switch.scss | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index e78dcb74127..7de5e2dbcd1 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -23,7 +23,7 @@
    -

    +

    General

    diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss index 762e1202bc5..af09ca3658a 100644 --- a/public/sass/components/_dashboard_settings.scss +++ b/public/sass/components/_dashboard_settings.scss @@ -49,6 +49,7 @@ .dashboard-settings__header { font-size: $font-size-h3; + margin-bottom: $spacer*2; } .dashboard-settings__nav-item { diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 6c1048c5cd4..764ae61a0db 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -116,14 +116,14 @@ .search-section { background: $panel-bg; border: $panel-border; - padding: $panel-padding; + padding: 0px 10px 2px 10px; margin-bottom: 3px; border-radius: 5px; } .search-section__header { font-size: $font-size-h6; - padding: 8px 0 2px 0; + padding: 6px 0 4px 0; color: $text-color-weak; display: flex; flex-grow: 1; @@ -139,7 +139,7 @@ } .search-section__header__icon { - padding: 2px 10px; + padding: 5px 10px; width: 35px; } @@ -149,11 +149,11 @@ .search-section__header__text { flex-grow: 1; + line-height: 24px; } .search-item { @include list-item(); - @include left-brand-border(); display: flex; flex-grow: 1; @@ -162,7 +162,6 @@ padding: 0px; &:hover, &.selected { - @include left-brand-border-gradient(); background: $list-item-hover-bg; } } diff --git a/public/sass/components/_switch.scss b/public/sass/components/_switch.scss index 6b81f144457..3d0da7e4579 100644 --- a/public/sass/components/_switch.scss +++ b/public/sass/components/_switch.scss @@ -104,10 +104,12 @@ .gf-form-switch--transparent { input + label { background: transparent; + border: none; } input + label::before, input + label::after { background: transparent; + border: none; } &:hover { From 271c597c9b84ee1053d74785ddfd33d967f3d11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 15:13:47 +0100 Subject: [PATCH 82/89] ux: style tweaks --- public/app/core/components/search/search.html | 6 ++--- .../components/search/search_results.html | 8 +++--- public/sass/components/_search.scss | 26 ++++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index a7d578f0193..03d2a66108c 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -55,15 +55,15 @@
    - + Dashboard - + Folder - + Find dashboards on Grafana.com
    diff --git a/public/app/core/components/search/search_results.html b/public/app/core/components/search/search_results.html index ad0aa3e6b71..324654b9815 100644 --- a/public/app/core/components/search/search_results.html +++ b/public/app/core/components/search/search_results.html @@ -13,9 +13,10 @@
     
    - - + + +
    @@ -44,4 +45,5 @@
    -
    \ No newline at end of file +

    + diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 764ae61a0db..6fae1889c24 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -83,11 +83,17 @@ margin-bottom: $spacer * 1.5; } -.search-filter-box-item { +.search-filter-box-link { display:block; margin-bottom: 16px; - i { + + &:last-child { + margin-bottom: 0; + } + + i, img { font-size: 20px; + margin-right: 5px; } } @@ -116,31 +122,27 @@ .search-section { background: $panel-bg; border: $panel-border; - padding: 0px 10px 2px 10px; + padding: 0px 4px 4px 4px; margin-bottom: 3px; border-radius: 5px; } .search-section__header { font-size: $font-size-h6; - padding: 6px 0 4px 0; + padding: 7px 4px 3px 0; color: $text-color-weak; display: flex; flex-grow: 1; &:hover, &.selected { - color: $link-hover-color; - - .search-section__header__toggle { - background: $tight-form-func-bg; - color: $link-hover-color; - } + color: $text-color; } } .search-section__header__icon { - padding: 5px 10px; - width: 35px; + padding: 5px 0px; + width: 43px; + text-align: center; } .search-section__header__toggle { From cfd755eb9389a398fde8261b6e21cd0de80ca644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 15:19:59 +0100 Subject: [PATCH 83/89] updated new dashboard folder --- .../features/dashboard/create_folder_ctrl.ts | 2 +- .../dashboard/partials/create_folder.html | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts index f194dabbf1e..69d03e21b5e 100644 --- a/public/app/features/dashboard/create_folder_ctrl.ts +++ b/public/app/features/dashboard/create_folder_ctrl.ts @@ -7,7 +7,7 @@ export class CreateFolderCtrl { titleTouched = false; constructor(private backendSrv, private $location, navModelSrv) { - this.navModel = navModelSrv.getNav('create', 'folder'); + this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0); } create() { diff --git a/public/app/features/dashboard/partials/create_folder.html b/public/app/features/dashboard/partials/create_folder.html index ae5fcc126e8..22dbaab1419 100644 --- a/public/app/features/dashboard/partials/create_folder.html +++ b/public/app/features/dashboard/partials/create_folder.html @@ -2,42 +2,42 @@
    -
    -
    -
    -
    - - - -
    -
    +

    New Dashboard Folder

    -
    -
    - -
    -
    + +
    +
    + + + +
    +
    -
    -
    - -
    -
    -
    +
    +
    + +
    +
    -
    - -
    -
    +
    +
    + +
    +
    + +
    + +
    +
    From de91d68402b4b9e912effc8d7f4488a8f12a8b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 15:28:41 +0100 Subject: [PATCH 84/89] fix: don't detect graphite version before it's saved --- public/app/features/plugins/ds_edit_ctrl.ts | 2 -- public/app/plugins/datasource/graphite/config_ctrl.ts | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 46e787738e5..24911b7f103 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import config from 'app/core/config'; diff --git a/public/app/plugins/datasource/graphite/config_ctrl.ts b/public/app/plugins/datasource/graphite/config_ctrl.ts index 595584691a2..232599f8988 100644 --- a/public/app/plugins/datasource/graphite/config_ctrl.ts +++ b/public/app/plugins/datasource/graphite/config_ctrl.ts @@ -15,6 +15,10 @@ export class GraphiteConfigCtrl { } autoDetectGraphiteVersion() { + if (!this.current.id) { + return; + } + this.datasourceSrv.loadDatasource(this.current.name) .then((ds) => { return ds.getVersion(); From 89db9cc97614082076ecce647c47ef6c67da2647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 16:15:24 +0100 Subject: [PATCH 85/89] fix: fixed dashboard api tests --- pkg/api/dashboard_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go index cd27639c4e4..84ac01bce9a 100644 --- a/pkg/api/dashboard_test.go +++ b/pkg/api/dashboard_test.go @@ -14,10 +14,23 @@ import ( "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/alerting" + "github.com/grafana/grafana/pkg/services/dashboards" . "github.com/smartystreets/goconvey/convey" ) +type fakeDashboardRepo struct { + inserted []*dashboards.SaveDashboardItem + getDashboard []*m.Dashboard +} + +func (repo *fakeDashboardRepo) SaveDashboard(json *dashboards.SaveDashboardItem) (*m.Dashboard, error) { + repo.inserted = append(repo.inserted, json) + return json.Dashboard, nil +} + +var fakeRepo *fakeDashboardRepo + func TestDashboardApiEndpoint(t *testing.T) { Convey("Given a dashboard with a parent folder which does not have an acl", t, func() { fakeDash := m.NewDashboard("Child dash") @@ -500,6 +513,9 @@ func postDashboardScenario(desc string, url string, routePattern string, role m. return PostDashboard(c, cmd) }) + fakeRepo = &fakeDashboardRepo{} + dashboards.SetRepository(fakeRepo) + sc.m.Post(routePattern, sc.defaultHandler) fn(sc) From 8aaaee5e16f0f26818f69bc343f24919f5372a64 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 Dec 2017 19:00:56 +0300 Subject: [PATCH 86/89] fix colorpicker colors order (width issue) (#10170) --- public/sass/components/_panel_graph.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss index c28a608052d..4741731b2b1 100644 --- a/public/sass/components/_panel_graph.scss +++ b/public/sass/components/_panel_graph.scss @@ -193,7 +193,7 @@ } .graph-legend-popover { - width: 200px; + width: 210px; label { display: inline-block; } From 10fbfcb1d3ed3f42f574e11a18eecf2c82879636 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 Dec 2017 19:02:19 +0300 Subject: [PATCH 87/89] Fix graph legend scroll (#10169) * graph panel: fix legend scroll * graph panel: enable scroll for table legend * graph panel: fix legend right side toggle --- public/app/plugins/panel/graph/legend.ts | 30 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/panel/graph/legend.ts b/public/app/plugins/panel/graph/legend.ts index 1a445068b97..791ebf761ae 100644 --- a/public/app/plugins/panel/graph/legend.ts +++ b/public/app/plugins/panel/graph/legend.ts @@ -220,12 +220,32 @@ module.directive('graphLegend', function(popoverSrv, $timeout) { elem.append(tbodyElem); } else { elem.append(seriesElements); + } - if (!legendScrollbar) { - legendScrollbar = new PerfectScrollbar(elem[0]); - } else { - legendScrollbar.update(); - } + if (!panel.legend.rightSide) { + addScrollbar(); + } else { + destroyScrollbar(); + } + } + + function addScrollbar() { + const scrollbarOptions = { + // Number of pixels the content height can surpass the container height without enabling the scroll bar. + scrollYMarginOffset: 2, + suppressScrollX: true + }; + + if (!legendScrollbar) { + legendScrollbar = new PerfectScrollbar(elem[0], scrollbarOptions); + } else { + legendScrollbar.update(); + } + } + + function destroyScrollbar() { + if (legendScrollbar) { + legendScrollbar.destroy(); } } } From 67f1435dc79f089f2536ee02c01a29980bbfda84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 17:18:25 +0100 Subject: [PATCH 88/89] minor fix for #10136 --- pkg/services/sqlstore/migrations/dashboard_acl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/migrations/dashboard_acl.go b/pkg/services/sqlstore/migrations/dashboard_acl.go index 5d92f721d38..c968f5f072a 100644 --- a/pkg/services/sqlstore/migrations/dashboard_acl.go +++ b/pkg/services/sqlstore/migrations/dashboard_acl.go @@ -28,7 +28,7 @@ func addDashboardAclMigrations(mg *Migrator) { //------- indexes ------------------ mg.AddMigration("add unique index dashboard_acl_dashboard_id", NewAddIndexMigration(dashboardAclV1, dashboardAclV1.Indices[0])) mg.AddMigration("add unique index dashboard_acl_dashboard_id_user_id", NewAddIndexMigration(dashboardAclV1, dashboardAclV1.Indices[1])) - mg.AddMigration("add unique index dashboard_acl_dashboard_id_group_id", NewAddIndexMigration(dashboardAclV1, dashboardAclV1.Indices[2])) + mg.AddMigration("add unique index dashboard_acl_dashboard_id_team_id", NewAddIndexMigration(dashboardAclV1, dashboardAclV1.Indices[2])) const rawSQL = ` INSERT INTO dashboard_acl From d85405d5b5aad87523f8441304cb3f71cd3644e1 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 12 Dec 2017 22:15:26 +0300 Subject: [PATCH 89/89] ux: move add member into its own page (#10167) --- public/app/core/routes/routes.ts | 5 + public/app/features/org/partials/invite.html | 99 +++++++++---------- .../app/features/org/partials/orgUsers.html | 4 +- public/app/features/org/user_invite_ctrl.ts | 21 +++- 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts index f2527f14e16..90612d4c4e2 100644 --- a/public/app/core/routes/routes.ts +++ b/public/app/core/routes/routes.ts @@ -104,6 +104,11 @@ function setupAngularRoutes($routeProvider, $locationProvider) { controllerAs: 'ctrl', resolve: loadOrgBundle, }) + .when('/org/users/new', { + templateUrl: 'public/app/features/org/partials/invite.html', + controller : 'UserInviteCtrl', + resolve: loadOrgBundle, + }) .when('/org/apikeys', { templateUrl: 'public/app/features/org/partials/orgApiKeys.html', controller : 'OrgApiKeysCtrl', diff --git a/public/app/features/org/partials/invite.html b/public/app/features/org/partials/invite.html index e1be0b5648e..330441fc88d 100644 --- a/public/app/features/org/partials/invite.html +++ b/public/app/features/org/partials/invite.html @@ -1,60 +1,49 @@ -
    + -
    -

    - Invite Users -

    - - - -
    +
    +
    + Send invite or add existing Grafana users to the organization + {{contextSrv.user.orgName}} +
    -
    +
    +
    +
    +
    + Email or Username + +
    +
    + Name + +
    +
    + Role + +
    +
    + + + +
    +
    +
    -
    - Send invite or add existing Grafana users to the organization - {{contextSrv.user.orgName}} -
    +
    +
    + + + Invite another + +
    + +
    - -
    -
    -
    - Email or Username - -
    -
    - Name - -
    -
    - Role - -
    -
    - - - -
    -
    -
    - -
    -
    - - - Invite another - -
    - -
    - -
    - - Cancel -
    -
    -
    -
    +
    + + Cancel +
    +
    +
    diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index 5f98614b854..7ab828562f0 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -38,10 +38,10 @@ - + {{ctrl.addUsersBtnName}} diff --git a/public/app/features/org/user_invite_ctrl.ts b/public/app/features/org/user_invite_ctrl.ts index cd6da83f10a..85e4f7699e5 100644 --- a/public/app/features/org/user_invite_ctrl.ts +++ b/public/app/features/org/user_invite_ctrl.ts @@ -1,14 +1,18 @@ -import angular from 'angular'; +import coreModule from 'app/core/core_module'; import _ from 'lodash'; export class UserInviteCtrl { /** @ngInject **/ - constructor($scope, backendSrv) { - $scope.invites = [ + constructor($scope, backendSrv, navModelSrv) { + $scope.navModel = navModelSrv.getNav('cfg', 'users', 0); + + const defaultInvites = [ {name: '', email: '', role: 'Editor'}, ]; + $scope.invites = _.cloneDeep(defaultInvites); + $scope.options = {skipEmails: false}; $scope.init = function() { }; @@ -20,11 +24,19 @@ export class UserInviteCtrl { $scope.invites = _.without($scope.invites, invite); }; + $scope.resetInvites = function() { + $scope.invites = _.cloneDeep(defaultInvites); + }; + $scope.sendInvites = function() { if (!$scope.inviteForm.$valid) { return; } $scope.sendSingleInvite(0); }; + $scope.invitesSent = function() { + $scope.resetInvites(); + }; + $scope.sendSingleInvite = function(index) { var invite = $scope.invites[index]; invite.skipEmails = $scope.options.skipEmails; @@ -34,7 +46,6 @@ export class UserInviteCtrl { if (index === $scope.invites.length) { $scope.invitesSent(); - $scope.dismiss(); } else { $scope.sendSingleInvite(index); } @@ -43,4 +54,4 @@ export class UserInviteCtrl { } } -angular.module('grafana.controllers').controller('UserInviteCtrl', UserInviteCtrl); +coreModule.controller('UserInviteCtrl', UserInviteCtrl);