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

Merge pull request #917 from mchataigner/master

Browse Source 
adding templating in opentsdb graphs
This commit is contained in:
Torkel Ödegaard 2014-10-28 15:39:14 +01:00
commit c3900398fc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/services/opentsdb/opentsdbDatasource.js
View File

@ -1,14 +1,15 @@
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'kbn' 'kbn',
'moment'
], ],
function (angular, _, kbn) { function (angular, _, kbn) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
module.factory('OpenTSDBDatasource', function($q, $http) { module.factory('OpenTSDBDatasource', function($q, $http, templateSrv) {
function OpenTSDBDatasource(datasource) { function OpenTSDBDatasource(datasource) {
this.type = 'opentsdb'; this.type = 'opentsdb';
@ -123,12 +124,12 @@ function (angular, _, kbn) {
} }
var query = { var query = {
metric: target.metric, metric: templateSrv.replace(target.metric),
aggregator: "avg" aggregator: "avg"
}; };
if (target.aggregator) { if (target.aggregator) {
query.aggregator = target.aggregator; query.aggregator = templateSrv.replace(target.aggregator);
} }
if (target.shouldComputeRate) { if (target.shouldComputeRate) {
@ -151,6 +152,11 @@ function (angular, _, kbn) {
} }
query.tags = angular.copy(target.tags); query.tags = angular.copy(target.tags);
if(query.tags){
for(var key in query.tags){
query.tags[key] = templateSrv.replace(query.tags[key]);
}
}
return query; return query;
} }