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

CustomDatasource: fixed build optimization issue with custom datasources, Fixes #994

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-10-28 19:00:46 +01:00
parent a7b0f6dc9f
commit e5bb7f7c2d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/datasource.example.js
View File

@ -19,7 +19,7 @@ function (angular, _, kbn) {
this.url = datasource.url; this.url = datasource.url;
} }
CustomDatasource.prototype.query = function(filterSrv, options) { CustomDatasource.prototype.query = function(options) {
// get from & to in seconds // get from & to in seconds
var from = kbn.parseDate(options.range.from).getTime() / 1000; var from = kbn.parseDate(options.range.from).getTime() / 1000;
var to = kbn.parseDate(options.range.to).getTime() / 1000; var to = kbn.parseDate(options.range.to).getTime() / 1000;

1
tasks/options/ngmin.js
View File

@ -10,6 +10,7 @@ module.exports = function(config) {
'app/filters/**/*.js', 'app/filters/**/*.js',
'app/panels/**/*.js', 'app/panels/**/*.js',
'app/routes/**/*.js', 'app/routes/**/*.js',
'plugins/**/*.js',
'app/app.js', 'app/app.js',
'vendor/angular/**/*.js', 'vendor/angular/**/*.js',
], ],