IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-10 08:03:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

add template variable to drop down list

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2015-08-18 14:09:42 +09:00
parent 28ccd63255
commit 1c6b7203cc
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@ -312,6 +312,15 @@ function (angular, _, kbn) {
return d.promise;
};
CloudWatchDatasource.prototype.getTemplateVariableNames = function() {
var variables = [];
templateSrv.fillVariableValuesForUrl(variables);
return _.map(_.keys(variables), function(k) {
return k.replace(/var-/, '$');
});
};
CloudWatchDatasource.prototype.metricFindQuery = function(query) {
var region;
var namespace;

13
public/app/plugins/datasource/cloudwatch/queryCtrl.js
View File

@ -7,7 +7,7 @@ function (angular, _) {
var module = angular.module('grafana.controllers');
module.controller('CloudWatchQueryCtrl', function($scope) {
module.controller('CloudWatchQueryCtrl', function($scope, templateSrv) {
$scope.init = function() {
$scope.target.namespace = $scope.target.namespace || '';
@ -40,19 +40,19 @@ function (angular, _) {
};
$scope.suggestRegion = function(query, callback) { // jshint unused:false
return $scope.datasource.performSuggestRegion();
return _.union($scope.datasource.performSuggestRegion(), $scope.datasource.getTemplateVariableNames());
};
$scope.suggestNamespace = function(query, callback) { // jshint unused:false
return $scope.datasource.performSuggestNamespace();
return _.union($scope.datasource.performSuggestNamespace(), $scope.datasource.getTemplateVariableNames());
};
$scope.suggestMetrics = function(query, callback) { // jshint unused:false
return $scope.datasource.performSuggestMetrics($scope.target.namespace);
return _.union($scope.datasource.performSuggestMetrics($scope.target.namespace), $scope.datasource.getTemplateVariableNames());
};
$scope.suggestDimensionKeys = function(query, callback) { // jshint unused:false
return $scope.datasource.performSuggestDimensionKeys($scope.target.namespace);
return _.union($scope.datasource.performSuggestDimensionKeys($scope.target.namespace), $scope.datasource.getTemplateVariableNames());
};
$scope.suggestDimensionValues = function(query, callback) {
@ -70,12 +70,13 @@ function (angular, _) {
var suggestData = _.chain(result)
.flatten(true)
.filter(function(dimension) {
return dimension.Name === $scope.target.currentDimensionKey;
return dimension.Name === templateSrv.replace($scope.target.currentDimensionKey);
})
.pluck('Value')
.uniq()
.value();
suggestData = _.union(suggestData, $scope.datasource.getTemplateVariableNames());
callback(suggestData);
}, function() {
callback([]);