| {{org.name}} |
{{org.role}} |
diff --git a/public/app/features/profile/partials/select_org.html b/public/app/features/org/partials/select_org.html
similarity index 100%
rename from public/app/features/profile/partials/select_org.html
rename to public/app/features/org/partials/select_org.html
diff --git a/public/app/features/org/prefs_control.ts b/public/app/features/org/prefs_control.ts
new file mode 100644
index 00000000000..53704d5e390
--- /dev/null
+++ b/public/app/features/org/prefs_control.ts
@@ -0,0 +1,98 @@
+///
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import coreModule from 'app/core/core_module';
+
+export class PrefsControlCtrl {
+ prefs: any;
+ oldTheme: any;
+ prefsForm: any;
+ mode: string;
+
+ timezones: any = [
+ {value: '', text: 'Default'},
+ {value: 'browser', text: 'Local browser time'},
+ {value: 'utc', text: 'UTC'},
+ ];
+ themes: any = [
+ {value: '', text: 'Default'},
+ {value: 'dark', text: 'Dark'},
+ {value: 'light', text: 'Light'},
+ ];
+
+ /** @ngInject **/
+ constructor(private backendSrv, private $location) {
+ }
+
+ $onInit() {
+ return this.backendSrv.get(`/api/${this.mode}/preferences`).then(prefs => {
+ this.prefs = prefs;
+ this.oldTheme = prefs.theme;
+ });
+ }
+
+ updatePrefs() {
+ if (!this.prefsForm.$valid) { return; }
+
+ var cmd = {
+ theme: this.prefs.theme,
+ timezone: this.prefs.timezone,
+ homeDashboardId: this.prefs.homeDashboardId
+ };
+
+ this.backendSrv.put(`/api/${this.mode}/preferences`, cmd).then(() => {
+ window.location.href = config.appSubUrl + this.$location.path();
+ });
+ }
+
+}
+
+var template = `
+
+`;
+
+export function prefsControlDirective() {
+ return {
+ restrict: 'E',
+ controller: PrefsControlCtrl,
+ bindToController: true,
+ controllerAs: 'ctrl',
+ template: template,
+ scope: {
+ mode: "@"
+ }
+ };
+}
+
+coreModule.directive('prefsControl', prefsControlDirective);
+
+
diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/org/profile_ctrl.ts
new file mode 100644
index 00000000000..65bff1f6c12
--- /dev/null
+++ b/public/app/features/org/profile_ctrl.ts
@@ -0,0 +1,51 @@
+///
+
+import config from 'app/core/config';
+import {coreModule} from 'app/core/core';
+import _ from 'lodash';
+
+export class ProfileCtrl {
+ user: any;
+ old_theme: any;
+ orgs: any;
+ userForm: any;
+
+ /** @ngInject **/
+ constructor(private backendSrv, private contextSrv, private $location) {
+ this.getUser();
+ this.getUserOrgs();
+ }
+
+ getUser() {
+ this.backendSrv.get('/api/user').then(user => {
+ this.user = user;
+ this.user.theme = user.theme || 'dark';
+ });
+ }
+
+ getUserOrgs() {
+ this.backendSrv.get('/api/user/orgs').then(orgs => {
+ this.orgs = orgs;
+ });
+ }
+
+ setUsingOrg(org) {
+ this.backendSrv.post('/api/user/using/' + org.orgId).then(() => {
+ window.location.href = config.appSubUrl + '/profile';
+ });
+ }
+
+ update() {
+ if (!this.userForm.$valid) { return; }
+
+ this.backendSrv.put('/api/user/', this.user).then(() => {
+ this.contextSrv.user.name = this.user.name || this.user.login;
+ if (this.old_theme !== this.user.theme) {
+ window.location.href = config.appSubUrl + this.$location.path();
+ }
+ });
+ }
+
+}
+
+coreModule.controller('ProfileCtrl', ProfileCtrl);
diff --git a/public/app/features/profile/selectOrgCtrl.js b/public/app/features/org/select_org_ctrl.js
similarity index 100%
rename from public/app/features/profile/selectOrgCtrl.js
rename to public/app/features/org/select_org_ctrl.js
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 52e9c64981c..c1f408e9374 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -165,6 +165,7 @@ class MetricsPanelCtrl extends PanelCtrl {
issueQueries(datasource) {
this.updateTimeRange();
+ this.datasource = datasource;
if (!this.panel.targets || this.panel.targets.length === 0) {
return this.$q.when([]);
@@ -251,7 +252,6 @@ class MetricsPanelCtrl extends PanelCtrl {
addDataQuery(datasource) {
var target = {
- datasource: datasource ? datasource.name : undefined
};
this.panel.targets.push(target);
}
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 2821164bb10..ff2e7fde1bd 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -45,7 +45,7 @@ export class PanelCtrl {
}
$scope.$on("refresh", () => this.refresh());
- $scope.$on("render", () => this.calculatePanelHeight());
+ $scope.$on("render", () => this.render());
}
init() {
@@ -149,6 +149,7 @@ export class PanelCtrl {
return;
}
+ this.calculatePanelHeight();
this.events.emit('render', payload);
}
diff --git a/public/app/features/plugins/import_list/import_list.ts b/public/app/features/plugins/import_list/import_list.ts
index 8eb726b81c0..6c82d3faa92 100644
--- a/public/app/features/plugins/import_list/import_list.ts
+++ b/public/app/features/plugins/import_list/import_list.ts
@@ -10,6 +10,7 @@ export class DashImportListCtrl {
plugin: any;
datasource: any;
+ /** @ngInject */
constructor($scope, private $http, private backendSrv, private $rootScope) {
this.dashboards = [];
diff --git a/public/app/features/profile/profileCtrl.js b/public/app/features/profile/profileCtrl.js
deleted file mode 100644
index bae85a3d0c4..00000000000
--- a/public/app/features/profile/profileCtrl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define([
- 'angular',
- 'app/core/config',
-],
-function (angular, config) {
- 'use strict';
-
- var module = angular.module('grafana.controllers');
-
- module.controller('ProfileCtrl', function($scope, backendSrv, contextSrv, $location) {
-
- $scope.init = function() {
- $scope.getUser();
- $scope.getUserOrgs();
- };
-
- $scope.getUser = function() {
- backendSrv.get('/api/user').then(function(user) {
- $scope.user = user;
- $scope.user.theme = user.theme || 'dark';
- $scope.old_theme = $scope.user.theme;
- });
- };
-
- $scope.getUserOrgs = function() {
- backendSrv.get('/api/user/orgs').then(function(orgs) {
- $scope.orgs = orgs;
- });
- };
-
- $scope.setUsingOrg = function(org) {
- backendSrv.post('/api/user/using/' + org.orgId).then(function() {
- window.location.href = config.appSubUrl + '/profile';
- });
- };
-
- $scope.update = function() {
- if (!$scope.userForm.$valid) { return; }
-
- backendSrv.put('/api/user/', $scope.user).then(function() {
- contextSrv.user.name = $scope.user.name || $scope.user.login;
- if ($scope.old_theme !== $scope.user.theme) {
- window.location.href = config.appSubUrl + $location.path();
- }
- });
- };
-
- $scope.init();
-
- });
-});
diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js
index b2916e1bcc7..291915ee99f 100644
--- a/public/app/features/templating/editorCtrl.js
+++ b/public/app/features/templating/editorCtrl.js
@@ -14,6 +14,7 @@ function (angular, _) {
datasource: null,
refresh: 0,
name: '',
+ hide: 0,
options: [],
includeAll: false,
multi: false,
@@ -25,6 +26,12 @@ function (angular, _) {
{value: 2, text: "On Time Range Change"},
];
+ $scope.hideOptions = [
+ {value: 0, text: ""},
+ {value: 1, text: "Label"},
+ {value: 2, text: "Variable"},
+ ];
+
$scope.init = function() {
$scope.mode = 'list';
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 7bd1fd0940f..d1cab90ac9d 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -74,32 +74,33 @@
Variable
|
-
-## 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
-
-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.
diff --git a/docs/sources/plugins/apps.md b/docs/sources/plugins/apps.md
new file mode 100644
index 00000000000..74038a9feb9
--- /dev/null
+++ b/docs/sources/plugins/apps.md
@@ -0,0 +1,24 @@
+---
+page_title: App plugin
+page_description: App plugin for Grafana
+page_keywords: grafana, plugins, documentation
+---
+
+
+# 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 app pages will be available in the main menu.
+
+