diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a158907f5..5a3a7f40560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ **UI Improvements* - [Issue #770](https://github.com/grafana/grafana/issues/770). UI: Panel dropdown menu replaced with a new panel menu +**Misc** - [Issue #877](https://github.com/grafana/grafana/issues/877). Graph: Smart auto decimal precision when using scaled unit formats - [Issue #850](https://github.com/grafana/grafana/issues/850). Graph: Shared tooltip that shows multiple series & crosshair line, thx @toni-moreno +- [Issue #938](https://github.com/grafana/grafana/issues/938). Panel: Plugin panels now reside outside of app/panels directory **Fixes** - [Issue #925](https://github.com/grafana/grafana/issues/925). Graph: bar width calculation fix for some edge cases (bars would render on top of each other) diff --git a/src/app/app.js b/src/app/app.js index ab5c8fd6355..0b75d459435 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -57,7 +57,6 @@ function (angular, $, _, appLevelRequire, config) { register_fns.factory = $provide.factory; register_fns.service = $provide.service; register_fns.filter = $filterProvider.register; - }); var apps_deps = [ diff --git a/src/app/components/settings.js b/src/app/components/settings.js index 825712f619f..01f40c2e761 100644 --- a/src/app/components/settings.js +++ b/src/app/components/settings.js @@ -15,7 +15,10 @@ function (_, crypto) { var defaults = { datasources : {}, window_title_prefix : 'Grafana - ', - panels : ['graph', 'text'], + panels : { + 'graph': { path: 'panels/graph' }, + 'text': { path: 'panels/text' } + }, plugins : {}, default_route : '/dashboard/file/default.json', playlist_timespan : "1m", @@ -76,7 +79,7 @@ function (_, crypto) { }); if (settings.plugins.panels) { - settings.panels = _.union(settings.panels, settings.plugins.panels); + _.extend(settings.panels, settings.plugins.panels); } if (!settings.plugins.dependencies) { diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js index dc2d880ca19..294862d5fae 100644 --- a/src/app/controllers/dashboardCtrl.js +++ b/src/app/controllers/dashboardCtrl.js @@ -21,7 +21,7 @@ function (angular, $, config, _) { $timeout) { $scope.editor = { index: 0 }; - $scope.panelNames = config.panels; + $scope.panelNames = _.map(config.panels, function(value, key) { return key; }); var resizeEventTimeout; this.init = function(dashboardData) { @@ -90,21 +90,12 @@ function (angular, $, config, _) { }; }; - $scope.edit_path = function(type) { - var p = $scope.panel_path(type); - if(p) { - return p+'/editor.html'; - } else { - return false; - } + $scope.panelEditorPath = function(type) { + return 'app/' + config.panels[type].path + '/editor.html'; }; - $scope.panel_path =function(type) { - if(type) { - return 'app/panels/'+type.replace(".","/"); - } else { - return false; - } + $scope.pulldownEditorPath = function(type) { + return 'app/panels/'+type+'/editor.html'; }; $scope.showJsonEditor = function(evt, options) { diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index 27299474bc0..3d6368a7793 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -201,7 +201,7 @@ function (angular, _, config, gfunc, Parser) { $scope.targetTextChanged = function() { parseTarget(); - $scope.$parent.get_data(); + $scope.get_data(); }; $scope.targetChanged = function() { diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js index e7587ace5c5..9e3c87fde3d 100644 --- a/src/app/directives/grafanaPanel.js +++ b/src/app/directives/grafanaPanel.js @@ -1,9 +1,10 @@ define([ 'angular', 'jquery', + 'config', './panelMenu', ], -function (angular, $) { +function (angular, $, config) { 'use strict'; angular @@ -68,10 +69,12 @@ function (angular, $) { elem.addClass('ng-cloak'); + var panelPath = config.panels[panelType].path; + $scope.require([ 'jquery', - 'text!panels/'+panelType+'/module.html', - 'panels/' + panelType + "/module", + 'text!'+panelPath+'/module.html', + panelPath + "/module", ], function ($, moduleTemplate) { var $module = $(moduleTemplate); $module.prepend(panelHeader); diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 0831c243a8a..d5896b55512 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -84,7 +84,7 @@
- +
diff --git a/src/app/partials/paneleditor.html b/src/app/partials/paneleditor.html index ebc8a40ac63..d1a5c5eaab8 100644 --- a/src/app/partials/paneleditor.html +++ b/src/app/partials/paneleditor.html @@ -17,7 +17,7 @@
-
+
diff --git a/src/plugins/custom.panel.example/editor.html b/src/plugins/custom.panel.example/editor.html new file mode 100644 index 00000000000..b121e866850 --- /dev/null +++ b/src/plugins/custom.panel.example/editor.html @@ -0,0 +1,10 @@ +
+
+
+ +
+
+ +
+
+
diff --git a/src/plugins/custom.panel.example/module.html b/src/plugins/custom.panel.example/module.html new file mode 100644 index 00000000000..08ecbe30daa --- /dev/null +++ b/src/plugins/custom.panel.example/module.html @@ -0,0 +1,3 @@ +
+

Custom panel

+
diff --git a/src/plugins/custom.panel.example/module.js b/src/plugins/custom.panel.example/module.js new file mode 100644 index 00000000000..d04d8fca959 --- /dev/null +++ b/src/plugins/custom.panel.example/module.js @@ -0,0 +1,31 @@ +define([ + 'angular', + 'app', + 'lodash', + 'require', +], +function (angular, app, _) { + 'use strict'; + + var module = angular.module('grafana.panels.custom', []); + app.useModule(module); + + module.controller('CustomPanelCtrl', function($scope, panelSrv) { + + $scope.panelMeta = { + description : "Example plugin panel", + }; + + // set and populate defaults + var _d = { + }; + + _.defaults($scope.panel, _d); + + $scope.init = function() { + panelSrv.init($scope); + }; + + $scope.init(); + }); +});