IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 05:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing PR for influxdb filters

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-06-03 21:23:42 +02:00
parent 2a261a32e2
commit 5bed5b9870
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/services/influxdb/influxdbDatasource.js
View File

@ -8,7 +8,7 @@ function (angular, _, kbn) {
var module = angular.module('kibana.services');
module.factory('InfluxDatasource', function($q, $http, filterSrv) {
module.factory('InfluxDatasource', function($q, $http) {
function InfluxDatasource(datasource) {
this.type = 'influxDB';
@ -59,7 +59,7 @@ function (angular, _, kbn) {
}
query = queryElements.join(" ");
query = filterSrv.applyFilterToTarget(query);
query = filterSrv.applyTemplateToTarget(query);
}
else {
var template = "select [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from \"[[series]]\" " +
@ -79,7 +79,7 @@ function (angular, _, kbn) {
};
query = _.template(template, templateData, this.templateSettings);
query = filterSrv.applyFilterToTarget(query);
query = filterSrv.applyTemplateToTarget(query);
target.query = query;
}
@ -111,10 +111,10 @@ function (angular, _, kbn) {
});
};
InfluxDatasource.prototype.metricFindQuery = function (query) {
InfluxDatasource.prototype.metricFindQuery = function (filterSrv, query) {
var interpolated;
try {
interpolated = filterSrv.applyFilterToTarget(query);
interpolated = filterSrv.applyTemplateToTarget(query);
}
catch(err) {
return $q.reject(err);