restructuring

src/app/controllers/all.js

@@ -8,7 +8,6 @@ define([
   './search',
   './search',
   './metricKeys',
   './metricKeys',
   './graphiteImport',
   './graphiteImport',
-  './influxTargetCtrl',
   './playlistCtrl',
   './playlistCtrl',
   './inspectCtrl',
   './inspectCtrl',
   './opentsdbTargetCtrl',
   './opentsdbTargetCtrl',

src/app/directives/all.js

@@ -12,11 +12,8 @@ define([
   './spectrumPicker',
   './spectrumPicker',
   './bootstrap-tagsinput',
   './bootstrap-tagsinput',
   './bodyClass',
   './bodyClass',
-  './addGraphiteFunc',
-  './graphiteFuncEditor',
   './templateParamSelector',
   './templateParamSelector',
   './graphiteSegment',
   './graphiteSegment',
   './grafanaVersionCheck',
   './grafanaVersionCheck',
   './dropdown.typeahead',
   './dropdown.typeahead',
-  './influxdbFuncEditor'
 ], function () {});
 ], function () {});

src/app/features/all.js

 define([
 define([
   './panellinkeditor/module',
   './panellinkeditor/module',
   './graphite/datasource',
   './graphite/datasource',
+  './influxdb/datasource',
 ], function () {});
 ], function () {});

src/app/directives/addGraphiteFunc.js → src/app/features/graphite/addGraphiteFunc.js

@@ -3,7 +3,7 @@ define([
   'app',
   'app',
   'lodash',
   'lodash',
   'jquery',
   'jquery',
-  '../features/graphite/gfunc',
+  './gfunc',
 ],
 ],
 function (angular, app, _, $, gfunc) {
 function (angular, app, _, $, gfunc) {
   'use strict';
   'use strict';

src/app/features/graphite/datasource.js

@@ -6,6 +6,8 @@ define([
   'kbn',
   'kbn',
   'moment',
   'moment',
   './queryCtrl',
   './queryCtrl',
+  './funcEditor',
+  './addGraphiteFunc',
 ],
 ],
 function (angular, _, $, config, kbn, moment) {
 function (angular, _, $, config, kbn, moment) {
   'use strict';
   'use strict';
@@ -18,14 +20,15 @@ function (angular, _, $, config, kbn, moment) {
       this.type = 'graphite';
       this.type = 'graphite';
       this.basicAuth = datasource.basicAuth;
       this.basicAuth = datasource.basicAuth;
       this.url = datasource.url;
       this.url = datasource.url;
-      this.editorSrc = 'app/features/graphite/partials/query.editor.html';
       this.name = datasource.name;
       this.name = datasource.name;
+      this.cacheTimeout = datasource.cacheTimeout;
+      this.withCredentials = datasource.withCredentials;
       this.render_method = datasource.render_method || 'POST';
       this.render_method = datasource.render_method || 'POST';
+
       this.supportAnnotations = true;
       this.supportAnnotations = true;
       this.supportMetrics = true;
       this.supportMetrics = true;
+      this.editorSrc = 'app/features/graphite/partials/query.editor.html';
       this.annotationEditorSrc = 'app/features/graphite/partials/annotation.editor.html';
       this.annotationEditorSrc = 'app/features/graphite/partials/annotation.editor.html';
-      this.cacheTimeout = datasource.cacheTimeout;
-      this.withCredentials = datasource.withCredentials;
     }
     }
 
 
     GraphiteDatasource.prototype.query = function(options) {
     GraphiteDatasource.prototype.query = function(options) {

src/app/services/influxdb/influxdbDatasource.js → src/app/features/influxdb/datasource.js

@@ -3,7 +3,9 @@ define([
   'lodash',
   'lodash',
   'kbn',
   'kbn',
   './influxSeries',
   './influxSeries',
-  './influxQueryBuilder'
+  './queryBuilder',
+  './queryCtrl',
+  './funcEditor',
 ],
 ],
 function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
 function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
   'use strict';
   'use strict';
@@ -14,20 +16,20 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
 
 
     function InfluxDatasource(datasource) {
     function InfluxDatasource(datasource) {
       this.type = 'influxDB';
       this.type = 'influxDB';
-      this.editorSrc = 'app/partials/influxdb/editor.html';
       this.urls = datasource.urls;
       this.urls = datasource.urls;
       this.username = datasource.username;
       this.username = datasource.username;
       this.password = datasource.password;
       this.password = datasource.password;
       this.name = datasource.name;
       this.name = datasource.name;
       this.basicAuth = datasource.basicAuth;
       this.basicAuth = datasource.basicAuth;
+      this.grafanaDB = datasource.grafanaDB;
 
 
       this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp;
       this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp;
       this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl;
       this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl;
 
 
-      this.grafanaDB = datasource.grafanaDB;
       this.supportAnnotations = true;
       this.supportAnnotations = true;
       this.supportMetrics = true;
       this.supportMetrics = true;
-      this.annotationEditorSrc = 'app/partials/influxdb/annotation_editor.html';
+      this.editorSrc = 'app/features/influxdb/partials/query.editor.html';
+      this.annotationEditorSrc = 'app/features/influxdb/partials/annotations.editor.html';
     }
     }
 
 
     InfluxDatasource.prototype.query = function(options) {
     InfluxDatasource.prototype.query = function(options) {

src/app/partials/influxdb/editor.html → src/app/features/influxdb/partials/query.editor.html

@@ -3,7 +3,7 @@
   <div  ng-repeat="target in panel.targets"
   <div  ng-repeat="target in panel.targets"
         class="grafana-target"
         class="grafana-target"
         ng-class="{'grafana-target-hidden': target.hide}"
         ng-class="{'grafana-target-hidden': target.hide}"
-        ng-controller="InfluxTargetCtrl"
+        ng-controller="InfluxQueryCtrl"
         ng-init="init()">
         ng-init="init()">
 
 
     <div class="grafana-target-inner-wrapper">
     <div class="grafana-target-inner-wrapper">

src/app/controllers/influxTargetCtrl.js → src/app/features/influxdb/queryCtrl.js

@@ -9,7 +9,7 @@ function (angular, _) {
 
 
   var seriesList = null;
   var seriesList = null;
 
 
-  module.controller('InfluxTargetCtrl', function($scope, $timeout) {
+  module.controller('InfluxQueryCtrl', function($scope, $timeout) {
 
 
     $scope.init = function() {
     $scope.init = function() {
       var target = $scope.target;
       var target = $scope.target;

src/app/services/datasourceSrv.js

@@ -2,7 +2,6 @@ define([
   'angular',
   'angular',
   'lodash',
   'lodash',
   'config',
   'config',
-  './influxdb/influxdbDatasource',
   './opentsdb/opentsdbDatasource',
   './opentsdb/opentsdbDatasource',
   './elasticsearch/es-datasource',
   './elasticsearch/es-datasource',
 ],
 ],

src/test/specs/influxQueryBuilder-specs.js

 define([
 define([
-  'services/influxdb/influxQueryBuilder'
+  'features/influxdb/queryBuilder'
 ], function(InfluxQueryBuilder) {
 ], function(InfluxQueryBuilder) {
   'use strict';
   'use strict';
 
 

src/test/specs/influxSeries-specs.js

 define([
 define([
-  'services/influxdb/influxSeries'
+  'features/influxdb/influxSeries'
 ], function(InfluxSeries) {
 ], function(InfluxSeries) {
   'use strict';
   'use strict';
 
 

src/test/specs/influxdb-datasource-specs.js

 define([
 define([
   'helpers',
   'helpers',
-  'services/influxdb/influxdbDatasource'
+  'features/influxdb/datasource'
 ], function(helpers) {
 ], function(helpers) {
   'use strict';
   'use strict';