From a2335707776dcf913e08ac4fef9a5435343649c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 14 Jan 2016 16:01:17 +0100
Subject: [PATCH] feat(plugins): upgraded opentsdb and prometheus to new plugin
 module return format

---
 public/app/plugins/datasource/mixed/module.ts   |  7 -------
 .../app/plugins/datasource/opentsdb/module.js   | 17 ++++++++---------
 .../app/plugins/datasource/prometheus/module.js | 17 ++++++++---------
 tslint.json                                     |  2 +-
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/public/app/plugins/datasource/mixed/module.ts b/public/app/plugins/datasource/mixed/module.ts
index 1f29e1e80f4..cdc740cf11a 100644
--- a/public/app/plugins/datasource/mixed/module.ts
+++ b/public/app/plugins/datasource/mixed/module.ts
@@ -3,12 +3,5 @@
 import angular from 'angular';
 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};
 
diff --git a/public/app/plugins/datasource/opentsdb/module.js b/public/app/plugins/datasource/opentsdb/module.js
index 82a5a5e25d6..470f40322d7 100644
--- a/public/app/plugins/datasource/opentsdb/module.js
+++ b/public/app/plugins/datasource/opentsdb/module.js
@@ -1,24 +1,23 @@
 define([
-  'angular',
   './datasource',
 ],
-function (angular, OpenTsDatasource) {
+function (OpenTsDatasource) {
   'use strict';
 
-  var module = angular.module('grafana.directives');
-
-  module.directive('metricQueryEditorOpentsdb', function() {
+  function metricsQueryEditor() {
     return {
       controller: 'OpenTSDBQueryCtrl',
       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 {
-    Datasource: OpenTsDatasource
+    Datasource: OpenTsDatasource,
+    metricsQueryEditor: metricsQueryEditor,
+    configView: configView,
   };
 });
diff --git a/public/app/plugins/datasource/prometheus/module.js b/public/app/plugins/datasource/prometheus/module.js
index 91b8d498645..3a4a274763f 100644
--- a/public/app/plugins/datasource/prometheus/module.js
+++ b/public/app/plugins/datasource/prometheus/module.js
@@ -1,21 +1,20 @@
 define([
-  'angular',
   './datasource',
 ],
-function (angular, PromDatasource) {
+function (PromDatasource) {
   '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'};
-  });
+  }
 
-  module.directive('datasourceCustomSettingsViewPrometheus', function() {
+  function configView() {
     return {templateUrl: 'app/plugins/datasource/prometheus/partials/config.html'};
-  });
+  }
 
   return {
-    Datasource: PromDatasource
+    Datasource: PromDatasource,
+    metricsQueryEditor: metricsQueryEditor,
+    configView: configView,
   };
 });
diff --git a/tslint.json b/tslint.json
index fc50e412f46..a6d1cf26d22 100644
--- a/tslint.json
+++ b/tslint.json
@@ -52,7 +52,7 @@
       "property-declaration": "nospace",
       "variable-declaration": "nospace"
     }],
-    "variable-name": false,
+    "variable-name": [true, "ban-keywords"],
     "whitespace": [true,
       "check-branch",
       "check-decl",