fix Prometheus link, expand template variable in expression

This commit is contained in:
Mitsuhiro Tanda
2015-12-31 15:47:42 +09:00
parent c0cf0cb802
commit be48caf59f

View File

@@ -7,7 +7,7 @@ function (angular, _) {
var module = angular.module('grafana.controllers');
module.controller('PrometheusQueryCtrl', function($scope) {
module.controller('PrometheusQueryCtrl', function($scope, templateSrv) {
$scope.init = function() {
var target = $scope.target;
@@ -48,7 +48,7 @@ function (angular, _) {
var range = Math.ceil(($scope.range.to.valueOf() - $scope.range.from.valueOf()) / 1000);
var endTime = $scope.range.to.utc().format('YYYY-MM-DD HH:MM');
var expr = {
expr: $scope.target.expr,
expr: templateSrv.replace($scope.target.expr, $scope.panel.scopedVars),
range_input: range + 's',
end_input: endTime,
step_input: '',