Просмотр исходного кода

Some fixes related to OpenTSDB enhancements, #1250

Torkel Ödegaard 10 лет назад
Родитель
Сommit
5494be4493

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

@@ -27,6 +27,7 @@ function (angular, _, kbn) {
       var qs = [];
       var qs = [];
 
 
       _.each(options.targets, function(target) {
       _.each(options.targets, function(target) {
+        if (!target.metric) { return; }
         qs.push(convertTargetToQuery(target, options));
         qs.push(convertTargetToQuery(target, options));
       });
       });
 
 

+ 1 - 1
public/app/plugins/datasource/opentsdb/partials/query.editor.html

@@ -55,7 +55,7 @@
                  placeholder="metric name"
                  placeholder="metric name"
                  data-min-length=0 data-items=100
                  data-min-length=0 data-items=100
 								 ng-model-onblur
 								 ng-model-onblur
-                 ng-blur="targetBlur()"
+                 ng-change="targetBlur()"
                  >
                  >
           <a bs-tooltip="target.errors.metric"
           <a bs-tooltip="target.errors.metric"
              style="color: rgb(229, 189, 28)"
              style="color: rgb(229, 189, 28)"

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

@@ -47,7 +47,7 @@ function (angular, _, kbn) {
     };
     };
 
 
     $scope.suggestMetrics = function(query, callback) {
     $scope.suggestMetrics = function(query, callback) {
-      $scope.datasource.metricFindQuery('metrics()')
+      $scope.datasource.metricFindQuery('metrics(' + query + ')')
         .then($scope.getTextValues)
         .then($scope.getTextValues)
         .then(callback);
         .then(callback);
     };
     };