From be8ec241063e43a880abcd292e177aa00316ea25 Mon Sep 17 00:00:00 2001 From: simnv Date: Tue, 15 Mar 2016 16:05:32 +0500 Subject: [PATCH 01/27] Slash escape regex Slash symbol "/" wasn't escaped when we chose variable from template dropdown, so we couldn't choose interface names like Gi9/10 when querying from influxdb. --- public/app/features/templating/templateSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js index ece69302196..98103f5259f 100644 --- a/public/app/features/templating/templateSrv.js +++ b/public/app/features/templating/templateSrv.js @@ -35,7 +35,7 @@ function (angular, _) { }; function regexEscape(value) { - return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); + return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&'); } function luceneEscape(value) { From 5af54c57baf9867689146cf02723df043ec306cb Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 17 Mar 2016 14:31:55 -0400 Subject: [PATCH 02/27] Update admin.md --- docs/sources/reference/admin.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/sources/reference/admin.md b/docs/sources/reference/admin.md index c5d5073020d..266fc998092 100644 --- a/docs/sources/reference/admin.md +++ b/docs/sources/reference/admin.md @@ -30,7 +30,8 @@ From the Grafana Server Admin page, you can access the System Info page which su ## Why would I have multiple Organizations? -In many cases, a Grafana installation will only have one Organization. There's no need to create multiple Organizations -if you want all your users to have access to the same set of dashboards and data. In a multitenant deployment, +Organizations in Grafana are best suited for a **multi-tenant deployment**. In a multi-tenant deployment, Organizations can be used to provide a full Grafana experience to different sets of users from a single Grafana instance, -at the convenience of the Grafana Administrator. +at the convenience of the Grafana Administrator. + +In most cases, a Grafana installation will only have **one** Organization. Since dashboards, data sources and other configuration items are not shared between organizations, there's no need to create multiple Organizations if you want all your users to have access to the same set of dashboards and data. From 6016033b8b11a17f48a8beab49c3adba7d0c77d5 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 17 Mar 2016 15:14:26 -0400 Subject: [PATCH 03/27] Finishing touches --- public/app/features/org/partials/newOrg.html | 28 +++++++++---------- .../app/features/org/partials/orgDetails.html | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/app/features/org/partials/newOrg.html b/public/app/features/org/partials/newOrg.html index 916c73177b7..88c348db78f 100644 --- a/public/app/features/org/partials/newOrg.html +++ b/public/app/features/org/partials/newOrg.html @@ -1,21 +1,21 @@ -
-
+
+
+

New Organization

+
-

Add Organization

+

Each organization contains their own dashboards, data sources and configuration, and cannot be shared between orgs. While users may belong to more than one, mutiple organization are most frequently used in multi-tenant deployments.

-
-
- Org. name - -
-
-
- -
-
+
+
+ Org. name + +
+
+
+ +
- diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index d0f99e23eb7..fe988570e50 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -3,7 +3,7 @@
-

Preferences

+

Org Preferences

General

From 9d4fa87914adb429d6b3b4af8b3a68d8e4cbb9bd Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Fri, 18 Mar 2016 01:13:34 -0700 Subject: [PATCH 04/27] Viewer not able to delete snapshot --- pkg/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 30bf617e1b6..29f7863ff60 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -78,7 +78,7 @@ func Register(r *macaron.Macaron) { r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot) r.Get("/api/snapshot/shared-options/", GetSharingOptions) r.Get("/api/snapshots/:key", GetDashboardSnapshot) - r.Get("/api/snapshots-delete/:key", DeleteDashboardSnapshot) + r.Get("/api/snapshots-delete/:key", reqEditorRole, DeleteDashboardSnapshot) // api renew session based on remember cookie r.Get("/api/login/ping", quota("session"), LoginApiPing) From 2b0499c968de9e06767fd5a958ba63657d80cced Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 17 Mar 2016 08:26:55 +0100 Subject: [PATCH 05/27] docs(plugin): update link to datasource docs --- docs/sources/plugins/datasources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/plugins/datasources.md b/docs/sources/plugins/datasources.md index 6bd11242f52..c44cd842844 100644 --- a/docs/sources/plugins/datasources.md +++ b/docs/sources/plugins/datasources.md @@ -4,7 +4,7 @@ page_description: Datasource plugins for Grafana page_keywords: grafana, plugins, documentation --- - > Our goal is not to have a very extensive documentation but rather have actual code that people can look at. An example implementation of a datasource can be found in the grafana repo under /examples/datasource-plugin-genericdatasource + > Our goal is not to have a very extensive documentation but rather have actual code that people can look at. An example implementation of a datasource can be found in this [example datasource repo](https://github.com/grafana/simple-json-datasource) # Datasources From 3c39a935f8d6fe2ba0138f3f7a43c0326767870a Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 17 Mar 2016 10:15:10 +0100 Subject: [PATCH 06/27] docs(plugins): docs for app plugins --- docs/sources/plugins/app.md | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 docs/sources/plugins/app.md diff --git a/docs/sources/plugins/app.md b/docs/sources/plugins/app.md new file mode 100644 index 00000000000..fcb1c556175 --- /dev/null +++ b/docs/sources/plugins/app.md @@ -0,0 +1,41 @@ +--- +page_title: App plugin +page_description: App plugin for Grafana +page_keywords: grafana, plugins, documentation +--- + + > Our goal is not to have a very extensive documentation but rather have actual code that people can look at. An example implementation of an app can be found in this [example app repo](https://github.com/grafana/example-app) + +# Apps + +App plugins is a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enables the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests. + +Datasource and panel plugins will show up like normal plugins. The custom pages will be available in the main menu. + +## README.md + +The readme file in the mounted folder will show up in the overview tab on the app page. + +## Module exports +```javascript +export { + ExampleAppConfigCtrl as ConfigCtrl, + StreamPageCtrl, + LogsPageCtrl +}; +``` +The only required export is the ConfigCtrl. Both StreamPageCtrl and LogsPageCtrl are custom pages defined in plugin.json + +## Custom pages +Custom pages are defined in the plugin.json like this. +```json +"pages": [ + { "name": "Live stream", "component": "StreamPageCtrl", "role": "Editor"}, + { "name": "Log view", "component": "LogsPageCtrl", "role": "Viewer"} +] +``` +The component field have to match one of the components exported in the module.js in the root of the plugin. + +## Bundled plugins + +When Grafana starts it will scan all directories within an app plugin and load folders containing a plugin.json as an plugin. From b1881e5f54a397d2a760641112c2af2fecba0349 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 17 Mar 2016 11:30:25 +0100 Subject: [PATCH 07/27] docs(plugins): update links to new examples --- docs/sources/plugins/developing_plugins.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/sources/plugins/developing_plugins.md b/docs/sources/plugins/developing_plugins.md index b235fa8d3de..91d1ff3f84e 100644 --- a/docs/sources/plugins/developing_plugins.md +++ b/docs/sources/plugins/developing_plugins.md @@ -22,9 +22,7 @@ The easiset way to try your plugin with grafana is to [setup grafana for develop ## Examples / boilerplate We currently have three different examples that you can fork to get started developing your grafana plugin. - - [generic-datasource](https://github.com/grafana/grafana/tree/master/examples/datasource-plugin-genericdatasource) (small datasource plugin for quering json data from backends) + - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for quering json data from backends) - [panel-boilderplate-es5](https://github.com/grafana/grafana/tree/master/examples/panel-boilerplate-es5) - - [nginx-app](https://github.com/grafana/grafana/tree/master/examples/nginx-app) + - [example-app](https://github.com/grafana/example-app) -## Publish your plugin -We are currently working on this. From 35e53ee511b0cd329448e878680983e58d5ab585 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 17 Mar 2016 15:13:16 +0100 Subject: [PATCH 08/27] docs(plugin): add info about enabling apps --- docs/sources/plugins/app.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/sources/plugins/app.md b/docs/sources/plugins/app.md index fcb1c556175..250af25c57d 100644 --- a/docs/sources/plugins/app.md +++ b/docs/sources/plugins/app.md @@ -10,7 +10,12 @@ page_keywords: grafana, plugins, documentation App plugins is a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enables the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests. -Datasource and panel plugins will show up like normal plugins. The custom pages will be available in the main menu. +Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu. + + + +## Enabling app plugins +After installing an app it have to be enabled before it show up as an datasource or panel. You can do that on the app page in the config tab. ## README.md From 4c7f638f3c15c15ce5bdcd8cdf7cb0327bf98de3 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 18 Mar 2016 09:47:41 +0100 Subject: [PATCH 09/27] fix(datasources): fixes header condition closes #4402 --- public/app/features/plugins/partials/ds_edit.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 1470a312bb0..1866fad50a0 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -4,8 +4,8 @@
-

Add data source

-

Edit data source

+

Add data source

+

Edit data source

    From 48a721e25918140f5f970bf4b0aa052b79cdfc40 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 18 Mar 2016 13:20:49 +0100 Subject: [PATCH 10/27] feat(tslint): remove two space requirements for comments --- tslint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tslint.json b/tslint.json index 32381ae0b28..15e36cf1f33 100644 --- a/tslint.json +++ b/tslint.json @@ -1,7 +1,7 @@ { "rules": { "class-name": true, - "comment-format": [true, "check-space"], + "comment-format": [false, "check-space"], "curly": true, "eofline": true, "forin": false, From 084ad69c53a10433a056516a4e38a49b1581997a Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 18 Mar 2016 19:32:50 -0400 Subject: [PATCH 11/27] Beginngings of style adjustments to support worldPing app --- public/sass/_variables.scss | 2 +- public/sass/components/_cards.scss | 6 ++++++ public/sass/components/_gf-form.scss | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 9f96591a4b9..60946bd41ba 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -161,7 +161,7 @@ $table-sm-cell-padding: .3rem !default; // Forms $input-padding-x: .75rem !default; $input-padding-y: .6rem !default; -$input-line-height: 1.35rem !default; +$input-line-height: 1.42rem !default; $input-btn-border-width: 1px; $input-border-radius: 0 $border-radius $border-radius 0 !default; diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss index 0d0e36bbb98..9f38c6137b0 100644 --- a/public/sass/components/_cards.scss +++ b/public/sass/components/_cards.scss @@ -58,6 +58,12 @@ &:hover { background: $card-background-hover; } + + .label-tag { + margin-left: 6px; + font-size: 11px; + padding: 2px 6px; + } } .card-item-body { diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 5f41ed20b25..3d93df79a29 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -139,6 +139,10 @@ $gf-form-label-margin: 0.25rem; } } +.gf-form-select-wrapper + .gf-form-select-wrapper { + margin-left: $gf-form-label-margin; +} + .gf-form-btn { padding: $input-padding-y $input-padding-x; line-height: $input-line-height; From 6d36641080e54f41b9629b279c59c51825e734e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 19 Mar 2016 11:25:19 +0100 Subject: [PATCH 12/27] fix(text panel): fixed escaping issue with markdown in text panel, fixes #4409 --- public/app/plugins/panel/text/module.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts index 211aa60412c..601f5ffc813 100644 --- a/public/app/plugins/panel/text/module.ts +++ b/public/app/plugins/panel/text/module.ts @@ -12,7 +12,7 @@ var panelDefaults = { export class TextPanelCtrl extends PanelCtrl { static templateUrl = `public/app/plugins/panel/text/module.html`; - converter: any; + remarkable: any; content: string; /** @ngInject */ @@ -54,21 +54,16 @@ export class TextPanelCtrl extends PanelCtrl { } renderMarkdown(content) { - var text = content - .replace(/&/g, '&') - .replace(/>/g, '>') - .replace(/ { - var md = new Remarkable(); + this.remarkable = new Remarkable(); this.$scope.$apply(() => { - this.updateContent(md.render(text)); + this.updateContent(this.remarkable.render(content)); }); }); } + + this.updateContent(this.remarkable.render(content)); } updateContent(html) { From 73e5c70d80ef4bd595b633327eaedd5549fb7fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 19 Mar 2016 11:37:40 +0100 Subject: [PATCH 13/27] fix(ux): fixed ux issue in new cards data source list, now handles overflowing urls and titles, fixes #4403 --- public/sass/components/_cards.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss index 9f38c6137b0..0d4d1ae88c9 100644 --- a/public/sass/components/_cards.scss +++ b/public/sass/components/_cards.scss @@ -63,14 +63,16 @@ margin-left: 6px; font-size: 11px; padding: 2px 6px; - } + } } .card-item-body { display: flex; + overflow: hidden; } .card-item-details { + overflow: hidden; } .card-item-header { @@ -83,10 +85,16 @@ .card-item-name { color: $headings-color; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; } .card-item-sub-name { color: $text-color-weak; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; } .card-list-layout-grid { From dd5b4a25d1b35809882132d1a28443936c45618c Mon Sep 17 00:00:00 2001 From: simnv Date: Sun, 20 Mar 2016 00:13:48 +0600 Subject: [PATCH 14/27] Slash escaping test --- public/test/specs/templateSrv-specs.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/test/specs/templateSrv-specs.js b/public/test/specs/templateSrv-specs.js index 65bd3f088ef..4948e1272ce 100644 --- a/public/test/specs/templateSrv-specs.js +++ b/public/test/specs/templateSrv-specs.js @@ -135,6 +135,11 @@ define([ expect(result).to.be('test|test2'); }); + it('slash should be properly escaped in regex format', function() { + var result = _templateSrv.formatValue('Gi3/14', 'regex'); + expect(result).to.be('Gi3\\/14'); + }); + }); describe('can check if variable exists', function() { From 9c2809a1a40d9092679398077d7316352d8b33bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 10:31:50 +0100 Subject: [PATCH 15/27] ux(): button style tweaks, align with grafana.net styles more --- public/sass/_variables.dark.scss | 10 +++++----- public/sass/_variables.scss | 2 +- public/sass/components/_buttons.scss | 5 +++-- public/sass/mixins/_mixins.scss | 3 +-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 1bde9554eba..84b01692069 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -126,22 +126,22 @@ $btn-primary-bg-hl: lighten($brand-primary, 8%); $btn-secondary-bg: $blue-dark; $btn-secondary-bg-hl: lighten($blue-dark, 3%); -$btn-success-bg-hl: darken($green, 3%); $btn-success-bg: lighten($green, 3%); +$btn-success-bg-hl: darken($green, 3%); $btn-warning-bg: $brand-warning; $btn-warning-bg-hl: lighten($brand-warning, 8%); -$btn-danger-bg: lighten($red, 3%); -$btn-danger-bg-hl: darken($red, 3%); +$btn-danger-bg: $red; +$btn-danger-bg-hl: lighten($red, 5%); $btn-inverse-bg: $dark-3; -$btn-inverse-bg-hl: lighten($dark-3, 1%); +$btn-inverse-bg-hl: lighten($dark-3, 4%); $btn-inverse-text-color: $link-color; $btn-link-color: $gray-3; -$iconContainerBackground: $black; +$iconContainerBackground: $black; // Forms // ------------------------- diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss index 60946bd41ba..e96328cb64d 100644 --- a/public/sass/_variables.scss +++ b/public/sass/_variables.scss @@ -216,7 +216,7 @@ $btn-padding-y-sm: .25rem !default; $btn-padding-x-lg: 1.5rem !default; $btn-padding-y-lg: .75rem !default; -$btn-border-radius: 3px; +$btn-border-radius: 2px; // sidemenu $side-menu-width: 14rem; diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss index a68f0642473..a6813c2766c 100644 --- a/public/sass/components/_buttons.scss +++ b/public/sass/components/_buttons.scss @@ -95,8 +95,9 @@ // Inverse appears as dark gray .btn-inverse { @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color); - box-shadow: none; - border: 1px solid $tight-form-func-highlight-bg; + //background: $card-background; + box-shadow: $card-shadow; + //border: 1px solid $tight-form-func-highlight-bg; } .btn-outline-primary { diff --git a/public/sass/mixins/_mixins.scss b/public/sass/mixins/_mixins.scss index 170a61ed296..b1dd8c047cf 100644 --- a/public/sass/mixins/_mixins.scss +++ b/public/sass/mixins/_mixins.scss @@ -282,8 +282,7 @@ color: $text-color; text-shadow: $textShadow; @include gradient-vertical($primaryColor, $secondaryColor); - border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); + border-color: $primaryColor; } // Gradients From 82232e2530735ad3d6f2b754999a8e52a714f602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 10:57:53 +0100 Subject: [PATCH 16/27] changelog(): added nested ldap group to changelog, #4401 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40a0421d45a..8a5f8b0d0d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * **KairosDB** The data source is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3524](https://github.com/grafana/grafana/issues/3524) ### Enhancements +* **LDAP**: Support for nested LDAP Groups, closes [#4401](https://github.com/grafana/grafana/issues/4401), [#3808](https://github.com/grafana/grafana/issues/3808) * **Sessions**: Support for memcached as session storage, closes [#3458](https://github.com/grafana/grafana/issues/3458) * **mysql**: Grafana now supports ssl for mysql, closes [#3584](https://github.com/grafana/grafana/issues/3584) * **snapshot**: Annotations are now included in snapshots, closes [#3635](https://github.com/grafana/grafana/issues/3635) From f4feb3808976fdd17a784c80436e07b7fe509d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 11:17:53 +0100 Subject: [PATCH 17/27] fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400 --- public/app/plugins/panel/graph/legend.js | 1 + public/app/plugins/panel/graph/module.html | 22 ----------------- public/app/plugins/panel/graph/module.ts | 3 ++- public/app/plugins/panel/graph/template.ts | 28 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 public/app/plugins/panel/graph/module.html create mode 100644 public/app/plugins/panel/graph/template.ts diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js index 11fd3355262..1a4f53b0c0a 100644 --- a/public/app/plugins/panel/graph/legend.js +++ b/public/app/plugins/panel/graph/legend.js @@ -101,6 +101,7 @@ function (angular, _, $) { } function render() { + console.log('render legend'); if (firstRender) { elem.append($container); $container.on('click', '.graph-legend-icon', openColorSelector); diff --git a/public/app/plugins/panel/graph/module.html b/public/app/plugins/panel/graph/module.html deleted file mode 100644 index 4fa5f263210..00000000000 --- a/public/app/plugins/panel/graph/module.html +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    - -
    - - No datapoints No datapoints returned from metric query - - Datapoints outside time range Can be caused by timezone mismatch between browser and graphite server -
    - -
    -
    - -
    - -
    -
    - -
    - - - diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 201d3f3e8c8..0776558c1db 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -4,6 +4,7 @@ import './graph'; import './legend'; import './series_overrides_ctrl'; +import template from './template'; import moment from 'moment'; import kbn from 'app/core/utils/kbn'; import _ from 'lodash'; @@ -83,7 +84,7 @@ var panelDefaults = { }; class GraphCtrl extends MetricsPanelCtrl { - static templateUrl = 'module.html'; + static template = template; hiddenSeries: any = {}; seriesList: any = []; diff --git a/public/app/plugins/panel/graph/template.ts b/public/app/plugins/panel/graph/template.ts new file mode 100644 index 00000000000..fc989e659c7 --- /dev/null +++ b/public/app/plugins/panel/graph/template.ts @@ -0,0 +1,28 @@ +var template = ` +
    +
    + +
    + + No datapoints No datapoints returned from metric query + + + Datapoints outside time range + Can be caused by timezone mismatch between browser and graphite server + +
    + +
    +
    + +
    + +
    +
    + +
    +`; + +export default template; + + From 4377e95c99e06a94f7ef43bff38914a5f5c360d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 11:21:06 +0100 Subject: [PATCH 18/27] fix(graph legend): minor correction to last commit --- public/app/plugins/panel/graph/legend.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js index 1a4f53b0c0a..d6d1bdbf2dd 100644 --- a/public/app/plugins/panel/graph/legend.js +++ b/public/app/plugins/panel/graph/legend.js @@ -101,7 +101,12 @@ function (angular, _, $) { } function render() { - console.log('render legend'); + if (!ctrl.panel.legend.show) { + elem.empty(); + firstRender = true; + return; + } + if (firstRender) { elem.append($container); $container.on('click', '.graph-legend-icon', openColorSelector); From 273311eed2ee431feb4f01f453507c764687e950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 17:33:30 +0100 Subject: [PATCH 19/27] ux(graph styles tab): updated forms in graph styles tab --- .../app/plugins/panel/graph/styleEditor.html | 177 ++++++++++-------- 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/public/app/plugins/panel/graph/styleEditor.html b/public/app/plugins/panel/graph/styleEditor.html index b730b1d397a..465e8d4894e 100644 --- a/public/app/plugins/panel/graph/styleEditor.html +++ b/public/app/plugins/panel/graph/styleEditor.html @@ -1,102 +1,123 @@
    -
    Chart Options
    - - - -
    - -
    -
    Line options
    -
    - - +
    Draw Modes
    +
    + +
    -
    - - +
    + +
    -
    - - +
    + +
    -
    - - -
    - -
    -
    Multiple Series
    - - - -
    - -
    -
    Rendering
    -
    - - +
    Mode Options
    +
    + +
    + +
    -
    - - +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + +
    +
    +
    +
    Misc options
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    -
    Tooltip
    - - -
    - - +
    Multiple Series
    +
    + + +
    +
    + + +
    +
    + +
    + +
    +
    -
    -
    Series specific overrides Regex match example: /server[0-3]/i
    -
    -
    -
      -
    • - -
      • +
      Series specific overrides Regex match example: /server[0-3]/i
      +
      +
      +
        +
      • + +
        • -
      • - alias or regex -
        • +
      • + alias or regex +
        • -
      • - -
        • +
      • + +
        • -
      • - - - Color: - - - {{option.name}}: {{option.value}} - -
        • +
      • + + + Color: + + + {{option.name}}: {{option.value}} + +
        • -
      • -
        • -
      -
      -
      -
      +
    • +
      • +
    +
    +
    +
    - -
    + +
    From 7f8643efdec070d34d4fce40ab0ac31e6e0566d4 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 21 Mar 2016 10:01:07 +0100 Subject: [PATCH 20/27] feat(cli): make all plugin commands subcommands --- docs/sources/plugins/installation.md | 12 ++++++------ pkg/cmd/grafana-cli/commands/commands.go | 10 +++++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md index d3a8013ce2b..7a4ed1889f9 100644 --- a/docs/sources/plugins/installation.md +++ b/docs/sources/plugins/installation.md @@ -17,30 +17,30 @@ On Linux systems the grafana-cli will assume that the grafana plugin directory i List available plugins ``` -grafana-cli list-remote +grafana-cli plugins list-remote ``` Install a plugin type ``` -grafana-cli install +grafana-cli plugins install ``` List installed plugins ``` -grafana-cli ls +grafana-cli plugins ls ``` Upgrade all installed plugins ``` -grafana-cli upgrade-all +grafana-cli plugins upgrade-all ``` Upgrade one plugin ``` -grafana-cli upgrade +grafana-cli plugins upgrade ``` Remove one plugin ``` -grafana-cli remove +grafana-cli plugins remove ``` diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go index f1b36c90ef2..55a0e2660ec 100644 --- a/pkg/cmd/grafana-cli/commands/commands.go +++ b/pkg/cmd/grafana-cli/commands/commands.go @@ -22,7 +22,7 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C } } -var Commands = []cli.Command{ +var pluginCommands = []cli.Command{ { Name: "install", Usage: "install ", @@ -49,3 +49,11 @@ var Commands = []cli.Command{ Action: runCommand(removeCommand), }, } + +var Commands = []cli.Command{ + { + Name: "plugins", + Usage: "Manage plugins for grafana", + Subcommands: pluginCommands, + }, +} From 14df3c62494a3d3c9e2eb28acd6199b7c14e596f Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 21 Mar 2016 10:05:23 +0100 Subject: [PATCH 21/27] feat(cli): use built in envvar support --- pkg/cmd/grafana-cli/main.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go index b277714fe9b..2b3b94f1751 100644 --- a/pkg/cmd/grafana-cli/main.go +++ b/pkg/cmd/grafana-cli/main.go @@ -12,10 +12,6 @@ import ( var version = "master" func getGrafanaPluginPath() string { - if os.Getenv("GF_PLUGIN_DIR") != "" { - return os.Getenv("GF_PLUGIN_DIR") - } - os := runtime.GOOS if os == "windows" { return "C:\\opt\\grafana\\plugins" @@ -34,14 +30,16 @@ func main() { app.Version = version app.Flags = []cli.Flag{ cli.StringFlag{ - Name: "path", - Usage: "path to the grafana installation", - Value: getGrafanaPluginPath(), + Name: "path", + Usage: "path to the grafana installation", + Value: getGrafanaPluginPath(), + EnvVar: "GF_PLUGIN_DIR", }, cli.StringFlag{ - Name: "repo", - Usage: "url to the plugin repository", - Value: "https://grafana-net.raintank.io/api/plugins", + Name: "repo", + Usage: "url to the plugin repository", + Value: "https://grafana-net.raintank.io/api/plugins", + EnvVar: "GF_PLUGIN_REPO", }, cli.BoolFlag{ Name: "debug, d", From 86a274a7eed37acb45f43c5e695e2bd6dce1b7d8 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 21 Mar 2016 12:30:13 +0100 Subject: [PATCH 22/27] feat(backendsrv): improves error response handling datasourceRequests that could not reach the destination threw invalid errors due to missing property. This fixes gives the user a better error message. closes #4428 --- public/app/core/services/backend_srv.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/app/core/services/backend_srv.js b/public/app/core/services/backend_srv.js index 6d0d112ba26..c5638af167e 100644 --- a/public/app/core/services/backend_srv.js +++ b/public/app/core/services/backend_srv.js @@ -105,6 +105,13 @@ function (angular, _, coreModule, config) { }); } + //populate error obj on Internal Error + if (_.isString(err.data) && err.status === 500 && !err.data) { + err.data = { + error: err.statusText + }; + } + // for Prometheus if (!err.data.message && _.isString(err.data.error)) { err.data.message = err.data.error; From 90c6b04361edf9f08adb3ed955f48dca767b94ae Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 21 Mar 2016 12:43:30 +0100 Subject: [PATCH 23/27] fix(backendsrv): remove invalid check --- public/app/core/services/backend_srv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/services/backend_srv.js b/public/app/core/services/backend_srv.js index c5638af167e..ff3784ab45e 100644 --- a/public/app/core/services/backend_srv.js +++ b/public/app/core/services/backend_srv.js @@ -106,7 +106,7 @@ function (angular, _, coreModule, config) { } //populate error obj on Internal Error - if (_.isString(err.data) && err.status === 500 && !err.data) { + if (_.isString(err.data) && err.status === 500) { err.data = { error: err.statusText }; From 65c0937741c769c511776fcf7c3092707052ef82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 21 Mar 2016 19:07:08 +0100 Subject: [PATCH 24/27] ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434 --- pkg/api/dtos/plugins.go | 1 - pkg/api/index.go | 39 ++++++++++++++----- pkg/api/plugins.go | 4 -- pkg/plugins/app_plugin.go | 11 +----- pkg/plugins/models.go | 15 +++++-- public/app/core/components/navbar/navbar.html | 6 +-- .../core/components/sidemenu/sidemenu.html | 5 ++- public/app/features/panel/panel_menu.js | 1 + .../plugins/partials/plugin_edit.html | 4 -- .../plugins/partials/plugin_page.html | 2 +- .../app/features/plugins/plugin_page_ctrl.ts | 5 ++- 11 files changed, 53 insertions(+), 40 deletions(-) diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go index 88683155006..d03a55861fc 100644 --- a/pkg/api/dtos/plugins.go +++ b/pkg/api/dtos/plugins.go @@ -11,7 +11,6 @@ type PluginSetting struct { Module string `json:"module"` BaseUrl string `json:"baseUrl"` Info *plugins.PluginInfo `json:"info"` - Pages []*plugins.AppPluginPage `json:"pages"` Includes []*plugins.PluginInclude `json:"includes"` Dependencies *plugins.PluginDependencies `json:"dependencies"` JsonData map[string]interface{} `json:"jsonData"` diff --git a/pkg/api/index.go b/pkg/api/index.go index 691c50f04f4..b26fb22ea52 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -56,8 +56,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR { dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Divider: true}) - dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Url: setting.AppSubUrl + "/dashboard/new"}) - dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Url: setting.AppSubUrl + "/import/dashboard"}) + dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Icon: "fa fa-plus", Url: setting.AppSubUrl + "/dashboard/new"}) + dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Icon: "fa fa-download", Url: setting.AppSubUrl + "/import/dashboard"}) } data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ @@ -88,22 +88,41 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { for _, plugin := range enabledPlugins.Apps { if plugin.Pinned { - pageLink := &dtos.NavLink{ + appLink := &dtos.NavLink{ Text: plugin.Name, Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit", Img: plugin.Info.Logos.Small, } - for _, page := range plugin.Pages { - if !page.SuppressNav { - pageLink.Children = append(pageLink.Children, &dtos.NavLink{ - Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + page.Slug, - Text: page.Name, - }) + for _, include := range plugin.Includes { + if include.Type == "page" && include.AddToNav { + link := &dtos.NavLink{ + Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + include.Slug, + Text: include.Name, + } + if include.DefaultNav { + appLink.Url = link.Url + } + appLink.Children = append(appLink.Children, link) + } + if include.Type == "dashboard" && include.AddToNav { + link := &dtos.NavLink{ + Url: setting.AppSubUrl + "/dashboard/db/" + include.Slug, + Text: include.Name, + } + if include.DefaultNav { + appLink.Url = link.Url + } + appLink.Children = append(appLink.Children, link) } } - data.MainNavLinks = append(data.MainNavLinks, pageLink) + if c.OrgRole == m.ROLE_ADMIN { + appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true}) + appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Config", Icon: "fa fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"}) + } + + data.MainNavLinks = append(data.MainNavLinks, appLink) } } diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 56d0d99296c..793cf33e3c6 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -82,10 +82,6 @@ func GetPluginSettingById(c *middleware.Context) Response { Module: def.Module, } - if app, exists := plugins.Apps[pluginId]; exists { - dto.Pages = app.Pages - } - query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId} if err := bus.Dispatch(&query); err != nil { if err != m.ErrPluginSettingNotFound { diff --git a/pkg/plugins/app_plugin.go b/pkg/plugins/app_plugin.go index 7fc170784f3..ecf59a15e15 100644 --- a/pkg/plugins/app_plugin.go +++ b/pkg/plugins/app_plugin.go @@ -8,14 +8,6 @@ import ( "github.com/grafana/grafana/pkg/models" ) -type AppPluginPage struct { - Name string `json:"name"` - Slug string `json:"slug"` - Component string `json:"component"` - Role models.RoleType `json:"role"` - SuppressNav bool `json:"suppressNav"` -} - type AppPluginCss struct { Light string `json:"light"` Dark string `json:"dark"` @@ -23,7 +15,6 @@ type AppPluginCss struct { type AppPlugin struct { FrontendPluginBase - Pages []*AppPluginPage `json:"pages"` Routes []*AppPluginRoute `json:"routes"` FoundChildPlugins []*PluginInclude `json:"-"` @@ -85,7 +76,7 @@ func (app *AppPlugin) initApp() { } // slugify pages - for _, page := range app.Pages { + for _, page := range app.Includes { if page.Slug == "" { page.Slug = slug.Make(page.Name) } diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go index 8443e91931d..28e092dcd4a 100644 --- a/pkg/plugins/models.go +++ b/pkg/plugins/models.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) @@ -74,10 +75,16 @@ type PluginDependencies struct { } type PluginInclude struct { - Name string `json:"name"` - Path string `json:"path"` - Type string `json:"type"` - Id string `json:"id"` + Name string `json:"name"` + Path string `json:"path"` + Type string `json:"type"` + Component string `json:"component"` + Role models.RoleType `json:"role"` + AddToNav bool `json:"AddToNav"` + DefaultNav bool `json:"defaultNav"` + Slug string `json:"slug"` + + Id string `json:"-"` } type PluginDependencyItem struct { diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index cbc0472c373..8c050174201 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -8,9 +8,9 @@ - - - {{::ctrl.title}} + + + {{ctrl.title}}
    diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index 7fa5cc56647..4ff30c92f47 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -40,7 +40,10 @@ diff --git a/public/app/features/panel/panel_menu.js b/public/app/features/panel/panel_menu.js index bdd4a9ce754..f75aacb32f1 100644 --- a/public/app/features/panel/panel_menu.js +++ b/public/app/features/panel/panel_menu.js @@ -56,6 +56,7 @@ function (angular, $, _, Tether) { template += ''; }); diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html index 6ae4ac5f95c..20b129b94e9 100644 --- a/public/app/features/plugins/partials/plugin_edit.html +++ b/public/app/features/plugins/partials/plugin_edit.html @@ -62,10 +62,6 @@ {{plug.name}} -
  • - - {{page.name}} -
diff --git a/public/app/features/plugins/partials/plugin_page.html b/public/app/features/plugins/partials/plugin_page.html index 1fc172a39cd..1105cff3b46 100644 --- a/public/app/features/plugins/partials/plugin_page.html +++ b/public/app/features/plugins/partials/plugin_page.html @@ -1,7 +1,7 @@ -
+
diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index 6a840717a80..b12960a7306 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -11,11 +11,12 @@ export class AppPageCtrl { /** @ngInject */ constructor(private backendSrv, private $routeParams: any, private $rootScope) { this.pluginId = $routeParams.pluginId; + this.backendSrv.get(`/api/plugins/${this.pluginId}/settings`).then(app => { this.appModel = app; - this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug}); + this.page = _.findWhere(app.includes, {slug: this.$routeParams.slug}); if (!this.page) { - $rootScope.appEvent('alert-error', ['App Page Not Found', '']); + this.$rootScope.appEvent('alert-error', ['App Page Not Found', '']); } }); } From f6cbbe1e6406807dd569c6bb6b52280678fb5ff2 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Mon, 21 Mar 2016 22:56:46 -0700 Subject: [PATCH 25/27] Redirect to home when switching orgs --- public/app/core/components/sidemenu/sidemenu.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 4c0e100f85c..4b2b1fd1ab3 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -87,6 +87,7 @@ export class SideMenuCtrl { switchOrg(orgId) { this.backendSrv.post('/api/user/using/' + orgId).then(() => { window.location.href = window.location.href; + this.$location.path('/'); }); }; } From 4110c7ffb0c5529e25010d6b6d842a7ab35cab4f Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 22 Mar 2016 09:25:46 +0100 Subject: [PATCH 26/27] fix(switchorg): fixes broken redirect when switchin org --- public/app/core/components/sidemenu/sidemenu.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 4b2b1fd1ab3..a47704f9d7d 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -86,8 +86,7 @@ export class SideMenuCtrl { switchOrg(orgId) { this.backendSrv.post('/api/user/using/' + orgId).then(() => { - window.location.href = window.location.href; - this.$location.path('/'); + window.location.href = `${config.appSubUrl}/`; }); }; } From 10df9dc8c3ed3c24edef075e9ee99bb2ce01f8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 22 Mar 2016 10:15:47 +0100 Subject: [PATCH 27/27] feat(plugins): finished app navigation enhancements, closes #4434 --- pkg/api/dtos/plugins.go | 23 ++++++++++--------- pkg/api/index.go | 18 +++++---------- pkg/api/plugins.go | 17 +++++++------- pkg/plugins/app_plugin.go | 15 +++++++++--- pkg/plugins/models.go | 3 ++- .../plugins/partials/plugin_page.html | 2 +- .../app/features/plugins/plugin_page_ctrl.ts | 1 + 7 files changed, 43 insertions(+), 36 deletions(-) diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go index d03a55861fc..53c911c10fa 100644 --- a/pkg/api/dtos/plugins.go +++ b/pkg/api/dtos/plugins.go @@ -3,17 +3,18 @@ package dtos import "github.com/grafana/grafana/pkg/plugins" type PluginSetting struct { - Name string `json:"name"` - Type string `json:"type"` - Id string `json:"id"` - Enabled bool `json:"enabled"` - Pinned bool `json:"pinned"` - Module string `json:"module"` - BaseUrl string `json:"baseUrl"` - Info *plugins.PluginInfo `json:"info"` - Includes []*plugins.PluginInclude `json:"includes"` - Dependencies *plugins.PluginDependencies `json:"dependencies"` - JsonData map[string]interface{} `json:"jsonData"` + Name string `json:"name"` + Type string `json:"type"` + Id string `json:"id"` + Enabled bool `json:"enabled"` + Pinned bool `json:"pinned"` + Module string `json:"module"` + BaseUrl string `json:"baseUrl"` + Info *plugins.PluginInfo `json:"info"` + Includes []*plugins.PluginInclude `json:"includes"` + Dependencies *plugins.PluginDependencies `json:"dependencies"` + JsonData map[string]interface{} `json:"jsonData"` + DefaultNavUrl string `json:"defaultNavUrl"` } type PluginListItem struct { diff --git a/pkg/api/index.go b/pkg/api/index.go index b26fb22ea52..a376f9504a4 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -90,7 +90,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if plugin.Pinned { appLink := &dtos.NavLink{ Text: plugin.Name, - Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit", + Url: plugin.DefaultNavUrl, Img: plugin.Info.Logos.Small, } @@ -100,9 +100,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + include.Slug, Text: include.Name, } - if include.DefaultNav { - appLink.Url = link.Url - } appLink.Children = append(appLink.Children, link) } if include.Type == "dashboard" && include.AddToNav { @@ -110,16 +107,13 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Url: setting.AppSubUrl + "/dashboard/db/" + include.Slug, Text: include.Name, } - if include.DefaultNav { - appLink.Url = link.Url - } appLink.Children = append(appLink.Children, link) } } if c.OrgRole == m.ROLE_ADMIN { appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true}) - appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Config", Icon: "fa fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"}) + appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "fa fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"}) } data.MainNavLinks = append(data.MainNavLinks, appLink) @@ -132,10 +126,10 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin", Children: []*dtos.NavLink{ - {Text: "Global Users", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/users"}, - {Text: "Global Orgs", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/orgs"}, - {Text: "Server Settings", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/settings"}, - {Text: "Server Stats", Icon: "fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/stats"}, + {Text: "Global Users", Url: setting.AppSubUrl + "/admin/users"}, + {Text: "Global Orgs", Url: setting.AppSubUrl + "/admin/orgs"}, + {Text: "Server Settings", Url: setting.AppSubUrl + "/admin/settings"}, + {Text: "Server Stats", Url: setting.AppSubUrl + "/admin/stats"}, }, }) } diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 793cf33e3c6..0411c0746ef 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -72,14 +72,15 @@ func GetPluginSettingById(c *middleware.Context) Response { } else { dto := &dtos.PluginSetting{ - Type: def.Type, - Id: def.Id, - Name: def.Name, - Info: &def.Info, - Dependencies: &def.Dependencies, - Includes: def.Includes, - BaseUrl: def.BaseUrl, - Module: def.Module, + Type: def.Type, + Id: def.Id, + Name: def.Name, + Info: &def.Info, + Dependencies: &def.Dependencies, + Includes: def.Includes, + BaseUrl: def.BaseUrl, + Module: def.Module, + DefaultNavUrl: def.DefaultNavUrl, } query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId} diff --git a/pkg/plugins/app_plugin.go b/pkg/plugins/app_plugin.go index ecf59a15e15..f565b0e2b22 100644 --- a/pkg/plugins/app_plugin.go +++ b/pkg/plugins/app_plugin.go @@ -6,6 +6,7 @@ import ( "github.com/gosimple/slug" "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) type AppPluginCss struct { @@ -75,10 +76,18 @@ func (app *AppPlugin) initApp() { } } + app.DefaultNavUrl = setting.AppSubUrl + "/plugins/" + app.Id + "/edit" + // slugify pages - for _, page := range app.Includes { - if page.Slug == "" { - page.Slug = slug.Make(page.Name) + for _, include := range app.Includes { + if include.Slug == "" { + include.Slug = slug.Make(include.Name) + } + if include.Type == "page" && include.DefaultNav { + app.DefaultNavUrl = setting.AppSubUrl + "/plugins/" + app.Id + "/page/" + include.Slug + } + if include.Type == "dashboard" && include.DefaultNav { + app.DefaultNavUrl = setting.AppSubUrl + "/dashboard/db/" + include.Slug } } } diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go index 28e092dcd4a..30f794285e1 100644 --- a/pkg/plugins/models.go +++ b/pkg/plugins/models.go @@ -42,6 +42,7 @@ type PluginBase struct { IncludedInAppId string `json:"-"` PluginDir string `json:"-"` + DefaultNavUrl string `json:"-"` // cache for readme file contents Readme []byte `json:"-"` @@ -80,7 +81,7 @@ type PluginInclude struct { Type string `json:"type"` Component string `json:"component"` Role models.RoleType `json:"role"` - AddToNav bool `json:"AddToNav"` + AddToNav bool `json:"addToNav"` DefaultNav bool `json:"defaultNav"` Slug string `json:"slug"` diff --git a/public/app/features/plugins/partials/plugin_page.html b/public/app/features/plugins/partials/plugin_page.html index 1105cff3b46..5aadf6db86b 100644 --- a/public/app/features/plugins/partials/plugin_page.html +++ b/public/app/features/plugins/partials/plugin_page.html @@ -1,4 +1,4 @@ - +
diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index b12960a7306..f9150702de6 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -15,6 +15,7 @@ export class AppPageCtrl { this.backendSrv.get(`/api/plugins/${this.pluginId}/settings`).then(app => { this.appModel = app; this.page = _.findWhere(app.includes, {slug: this.$routeParams.slug}); + if (!this.page) { this.$rootScope.appEvent('alert-error', ['App Page Not Found', '']); }