Skip to content

Commit 33aa3f0

Browse files
committed
Made tag_values query more robust
1 parent e4e042e commit 33aa3f0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

public/app/plugins/datasource/opentsdb/datasource.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ function (angular, _, dateMath) {
168168
return $q.when([]);
169169
}
170170

171-
var keysArray = keys.split(",");
171+
var keysArray = keys.split(",").map(function(key) {
172+
return key.trim();
173+
});
172174
var key = keysArray[0];
173175
var keysQuery = key + "=*";
174176

public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ describe('opentsdb', function() {
5555
ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env)').then(function(data) { results = data; });
5656
ctx.$rootScope.$apply();
5757
expect(requestOptions.url).to.be('/api/search/lookup');
58-
expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env}');
58+
expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env}');
5959
});
6060

6161
it('tag_values(cpu, test) should generate lookup query', function() {
6262
ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env, region=$region)').then(function(data) { results = data; });
6363
ctx.$rootScope.$apply();
6464
expect(requestOptions.url).to.be('/api/search/lookup');
65-
expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env, region=$region}');
65+
expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env,region=$region}');
6666
});
6767

6868
it('suggest_tagk() should generate api suggest query', function() {

0 commit comments

Comments
 (0)