fix(datasources): minor fix to data sources after apps branch merge

pull/3712/head
Torkel Ödegaard 9 years ago
parent 4db57cc0bb
commit a87b5f757d
  1. 2
      .gitignore
  2. 16
      public/app/plugins/datasource/grafana/datasource.ts
  3. 14
      public/app/plugins/datasource/grafana/module.ts
  4. 14
      public/app/plugins/datasource/mixed/module.ts

2
.gitignore vendored

@ -31,5 +31,5 @@ public/css/*.min.css
conf/custom.ini
fig.yml
profile.cov
grafana
/grafana
.notouch

@ -0,0 +1,16 @@
///<reference path="../../../headers/common.d.ts" />
class GrafanaDatasource {
constructor(private backendSrv) {}
query(options) {
return this.backendSrv.get('/api/metrics/test', {
from: options.range.from.valueOf(),
to: options.range.to.valueOf(),
maxDataPoints: options.maxDataPoints
});
}
}
export {GrafanaDatasource};

@ -0,0 +1,14 @@
///<reference path="../../../headers/common.d.ts" />
import angular from 'angular';
import {GrafanaDatasource} from './datasource';
var module = angular.module('grafana.directives');
module.directive('metricQueryEditorGrafana', function() {
return {templateUrl: 'app/plugins/datasource/grafana/partials/query.editor.html'};
});
export {GrafanaDatasource, GrafanaDatasource as Datasource};

@ -0,0 +1,14 @@
///<reference path="../../../headers/common.d.ts" />
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};
Loading…
Cancel
Save