feat(plugins): upgraded opentsdb and prometheus to new plugin module return format

public/app/plugins/datasource/mixed/module.ts

@@ -3,12 +3,5 @@
 import angular from 'angular';
 import angular from 'angular';
 import {MixedDatasource} from './datasource';
 import {MixedDatasource} from './datasource';
 
 
-var module = angular.module('grafana.directives');
-
-module.directive('metricQueryEditorMixed', function() {
-  return {templateUrl: 'app/plugins/datasource/mixed/partials/query.editor.html'};
-});
-
-
 export {MixedDatasource, MixedDatasource as Datasource};
 export {MixedDatasource, MixedDatasource as Datasource};
 
 

public/app/plugins/datasource/opentsdb/module.js

 define([
 define([
-  'angular',
   './datasource',
   './datasource',
 ],
 ],
-function (angular, OpenTsDatasource) {
+function (OpenTsDatasource) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('grafana.directives');
-
-  module.directive('metricQueryEditorOpentsdb', function() {
+  function metricsQueryEditor() {
     return {
     return {
       controller: 'OpenTSDBQueryCtrl',
       controller: 'OpenTSDBQueryCtrl',
       templateUrl: 'app/plugins/datasource/opentsdb/partials/query.editor.html',
       templateUrl: 'app/plugins/datasource/opentsdb/partials/query.editor.html',
     };
     };
-  });
+  }
 
 
-  module.directive('datasourceCustomSettingsViewOpentsdb', function() {
+  function configView() {
     return {templateUrl: 'app/plugins/datasource/opentsdb/partials/config.html'};
     return {templateUrl: 'app/plugins/datasource/opentsdb/partials/config.html'};
-  });
+  }
 
 
   return {
   return {
-    Datasource: OpenTsDatasource
+    Datasource: OpenTsDatasource,
+    metricsQueryEditor: metricsQueryEditor,
+    configView: configView,
   };
   };
 });
 });

public/app/plugins/datasource/prometheus/module.js

 define([
 define([
-  'angular',
   './datasource',
   './datasource',
 ],
 ],
-function (angular, PromDatasource) {
+function (PromDatasource) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('grafana.directives');
-
-  module.directive('metricQueryEditorPrometheus', function() {
+  function metricsQueryEditor() {
     return {controller: 'PrometheusQueryCtrl', templateUrl: 'app/plugins/datasource/prometheus/partials/query.editor.html'};
     return {controller: 'PrometheusQueryCtrl', templateUrl: 'app/plugins/datasource/prometheus/partials/query.editor.html'};
-  });
+  }
 
 
-  module.directive('datasourceCustomSettingsViewPrometheus', function() {
+  function configView() {
     return {templateUrl: 'app/plugins/datasource/prometheus/partials/config.html'};
     return {templateUrl: 'app/plugins/datasource/prometheus/partials/config.html'};
-  });
+  }
 
 
   return {
   return {
-    Datasource: PromDatasource
+    Datasource: PromDatasource,
+    metricsQueryEditor: metricsQueryEditor,
+    configView: configView,
   };
   };
 });
 });

tslint.json

@@ -52,7 +52,7 @@
       "property-declaration": "nospace",
       "property-declaration": "nospace",
       "variable-declaration": "nospace"
       "variable-declaration": "nospace"
     }],
     }],
-    "variable-name": false,
+    "variable-name": [true, "ban-keywords"],
     "whitespace": [true,
     "whitespace": [true,
       "check-branch",
       "check-branch",
       "check-decl",
       "check-decl",