IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-14 16:01:17 +01:00
parent 6fae264222
commit a233570777
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/mixed/module.ts
View File

@ -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};

17
public/app/plugins/datasource/opentsdb/module.js
View File

@ -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,
};
});

17
public/app/plugins/datasource/prometheus/module.js
View File

@ -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,
};
});

2
tslint.json
View File

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