Explorar el Código

Made tag_values query more robust

utkarshcmu hace 9 años
padre
commit
33aa3f0fc5

+ 3 - 1
public/app/plugins/datasource/opentsdb/datasource.js

@@ -168,7 +168,9 @@ function (angular, _, dateMath) {
         return $q.when([]);
         return $q.when([]);
       }
       }
 
 
-      var keysArray = keys.split(",");
+      var keysArray = keys.split(",").map(function(key) {
+        return key.trim();
+      });
       var key = keysArray[0];
       var key = keysArray[0];
       var keysQuery = key + "=*";
       var keysQuery = key + "=*";
 
 

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

@@ -55,14 +55,14 @@ describe('opentsdb', function() {
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env)').then(function(data) { results = data; });
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env)').then(function(data) { results = data; });
       ctx.$rootScope.$apply();
       ctx.$rootScope.$apply();
       expect(requestOptions.url).to.be('/api/search/lookup');
       expect(requestOptions.url).to.be('/api/search/lookup');
-      expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env}');
+      expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env}');
     });
     });
 
 
     it('tag_values(cpu, test) should generate lookup query', function() {
     it('tag_values(cpu, test) should generate lookup query', function() {
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env, region=$region)').then(function(data) { results = data; });
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env, region=$region)').then(function(data) { results = data; });
       ctx.$rootScope.$apply();
       ctx.$rootScope.$apply();
       expect(requestOptions.url).to.be('/api/search/lookup');
       expect(requestOptions.url).to.be('/api/search/lookup');
-      expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env, region=$region}');
+      expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env,region=$region}');
     });
     });
 
 
     it('suggest_tagk() should generate api suggest query', function() {
     it('suggest_tagk() should generate api suggest query', function() {