- Auto steps How many times should the current time range be divided to calculate the value
+ Step count How many times should the current time range be divided to calculate the value
-
+
{{infoText}}
diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index e083aa2aab5..92b150f2f15 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -21,6 +21,10 @@ export class QueryVariable implements Variable {
name: string;
multi: boolean;
includeAll: boolean;
+ useTags: boolean;
+ tagsQuery: string;
+ tagValuesQuery: string;
+ tags: any[];
defaults = {
type: 'query',
@@ -37,8 +41,10 @@ export class QueryVariable implements Variable {
allValue: null,
options: [],
current: {},
- tagsQuery: null,
- tagValuesQuery: null,
+ tags: [],
+ useTags: false,
+ tagsQuery: "",
+ tagValuesQuery: "",
};
/** @ngInject **/
@@ -77,9 +83,37 @@ export class QueryVariable implements Variable {
updateOptions() {
return this.datasourceSrv.get(this.datasource)
.then(this.updateOptionsFromMetricFindQuery.bind(this))
+ .then(this.updateTags.bind(this))
.then(this.variableSrv.validateVariableSelectionState.bind(this.variableSrv, this));
}
+ updateTags(datasource) {
+ if (this.useTags) {
+ return datasource.metricFindQuery(this.tagsQuery).then(results => {
+ this.tags = [];
+ for (var i = 0; i < results.length; i++) {
+ this.tags.push(results[i].text);
+ }
+ return datasource;
+ });
+ } else {
+ delete this.tags;
+ }
+
+ return datasource;
+ }
+
+ getValuesForTag(tagKey) {
+ return this.datasourceSrv.get(this.datasource).then(datasource => {
+ var query = this.tagValuesQuery.replace('$tag', tagKey);
+ return datasource.metricFindQuery(query).then(function (results) {
+ return _.map(results, function(value) {
+ return value.text;
+ });
+ });
+ });
+ }
+
updateOptionsFromMetricFindQuery(datasource) {
return datasource.metricFindQuery(this.query).then(results => {
this.options = this.metricNamesToVariableValues(results);
@@ -147,11 +181,11 @@ export class QueryVariable implements Variable {
} else if (sortType === 2) {
options = _.sortBy(options, function(opt) {
var matches = opt.text.match(/.*?(\d+).*/);
- if (!matches) {
- return 0;
- } else {
- return parseInt(matches[1], 10);
- }
+ if (!matches) {
+ return 0;
+ } else {
+ return parseInt(matches[1], 10);
+ }
});
}
diff --git a/public/test/specs/value_select_dropdown_specs.js b/public/test/specs/value_select_dropdown_specs.js
index 2bca4aaaf5c..0672ec6eedf 100644
--- a/public/test/specs/value_select_dropdown_specs.js
+++ b/public/test/specs/value_select_dropdown_specs.js
@@ -9,22 +9,26 @@ function () {
var ctrl;
var tagValuesMap = {};
var rootScope;
+ var q;
beforeEach(module('grafana.core'));
beforeEach(inject(function($controller, $rootScope, $q, $httpBackend) {
rootScope = $rootScope;
+ q = $q;
scope = $rootScope.$new();
ctrl = $controller('ValueSelectDropdownCtrl', {$scope: scope});
- ctrl.getValuesForTag = function(obj) {
- return $q.when(tagValuesMap[obj.tagKey]);
- };
ctrl.onUpdated = sinon.spy();
$httpBackend.when('GET', /\.html$/).respond('');
}));
describe("Given simple variable", function() {
beforeEach(function() {
- ctrl.variable = {current: {text: 'hej', value: 'hej' }};
+ ctrl.variable = {
+ current: {text: 'hej', value: 'hej' },
+ getValuesForTag: function(key) {
+ return q.when(tagValuesMap[key]);
+ },
+ };
ctrl.init();
});
@@ -43,6 +47,9 @@ function () {
{text: 'server-3', value: 'server-3'},
],
tags: ["key1", "key2", "key3"],
+ getValuesForTag: function(key) {
+ return q.when(tagValuesMap[key]);
+ },
multi: true
};
tagValuesMap.key1 = ['server-1', 'server-3'];
@@ -145,6 +152,9 @@ function () {
{text: 'server-3', value: 'server-3'},
],
tags: ["key1", "key2", "key3"],
+ getValuesForTag: function(key) {
+ return q.when(tagValuesMap[key]);
+ },
multi: true
};
ctrl.init();