@@ -1,15 +1,9 @@
define([
'./grafanaCtrl',
- './dashboardCtrl',
- './dashboardNavCtrl',
- './row',
- './submenuCtrl',
'./pulldown',
'./search',
'./metricKeys',
'./graphiteImport',
- './playlistCtrl',
'./inspectCtrl',
- './sharePanelCtrl',
'./jsonEditorCtrl',
], function () {});
@@ -6,4 +6,5 @@ define([
'./influxdb/datasource',
'./opentsdb/datasource',
'./elasticsearch/datasource',
+ './dashboard/all',
@@ -0,0 +1,14 @@
+define([
+ './dashboardCtrl',
+ './dashboardNavCtrl',
+ './playlistCtrl',
+ './rowCtrl',
+ './sharePanelCtrl',
+ './submenuCtrl',
+ './dashboardSrv',
+ './keybindings',
+ './viewStateSrv',
+ './playlistSrv',
+ './panelSrv',
+ './timeSrv',
+], function () {});
@@ -4,7 +4,6 @@ define([
'kbn',
'lodash',
'moment',
- '../timer',
],
function (angular, $, kbn, _, moment) {
'use strict';
@@ -7,7 +7,6 @@ define([
'components/timeSeries',
'components/panelmeta',
- 'services/panelSrv',
'./seriesOverridesCtrl',
'./graph',
'./legend',
@@ -5,7 +5,6 @@ define([
'./singleStatPanel',
function (angular, app, _, TimeSeries, kbn, PanelMeta) {
@@ -2,15 +2,8 @@ define([
'./alertSrv',
'./utilSrv',
'./datasourceSrv',
- './timeSrv',
- './panelSrv',
'./timer',
'./keyboardManager',
'./popoverSrv',
- './playlistSrv',
- './unsavedChangesSrv',
- './dashboard/dashboardKeyBindings',
- './dashboard/dashboardSrv',
- './dashboard/dashboardViewStateSrv',
function () {});
@@ -1,5 +1,5 @@
- 'services/dashboard/dashboardSrv'
+ 'features/dashboard/dashboardSrv'
], function() {
- 'services/dashboard/dashboardViewStateSrv'
+ 'features/dashboard/viewStateSrv'
@@ -1,5 +1,6 @@
'helpers',
+ 'features/dashboard/panelSrv',
'panels/graph/module'
], function(helpers) {
@@ -1,6 +1,6 @@
- 'controllers/row'
+ 'features/dashboard/rowCtrl'
- 'controllers/sharePanelCtrl'
+ 'features/dashboard/sharePanelCtrl'
@@ -2,7 +2,8 @@ define([
'mocks/dashboard-mock',
- 'services/timeSrv'
+ 'services/timer',
+ 'features/dashboard/timeSrv'
], function(dashboardMock, helpers, _) {
@@ -109,7 +109,6 @@ require([
}
-
angular.module('grafana', ['ngRoute']);
angular.module('grafana.services', ['ngRoute', '$strap.directives']);
angular.module('grafana.panels', []);