From 1332ddbc93bd98394a0df8ff512258b1893183f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 16 Aug 2015 09:52:45 +0200 Subject: [PATCH] feat(mixed datasources): updated OpenTSDB data source query editor to new model, #436 --- .../influxdb/partials/query.editor.html | 25 +- .../plugins/datasource/mixed/datasource.js | 9 +- .../opentsdb/partials/query.editor.html | 407 ++++++++---------- .../plugins/datasource/opentsdb/queryCtrl.js | 8 + public/css/less/tightform.less | 5 + 5 files changed, 212 insertions(+), 242 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 4c02c497b64..7f800420b9c 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -80,8 +80,7 @@
- + diff --git a/public/app/plugins/datasource/mixed/datasource.js b/public/app/plugins/datasource/mixed/datasource.js index 910cff8e8ee..a74e872276b 100644 --- a/public/app/plugins/datasource/mixed/datasource.js +++ b/public/app/plugins/datasource/mixed/datasource.js @@ -1,9 +1,8 @@ define([ 'angular', 'lodash', - 'kbn', ], -function (angular, _, kbn) { +function (angular, _) { 'use strict'; var module = angular.module('grafana.services'); @@ -27,12 +26,6 @@ function (angular, _, kbn) { return { data: _.flatten(_.pluck(results, 'data')) }; }); - // console.log(options.targets); - // // get from & to in seconds - // var from = kbn.parseDate(options.range.from).getTime(); - // var to = kbn.parseDate(options.range.to).getTime(); - // - // return backendSrv.get('/api/metrics/test', { from: from, to: to, maxDataPoints: options.maxDataPoints }); }; return MixedDatasource; diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html index 0e456a29b8b..7660eba2a48 100644 --- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html +++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html @@ -1,241 +1,208 @@ -
- -
- -
- +
+ +
  • + + + +
    • + - +
      +
    • + {{targetLetters[$index]}} +
      • +
    • + + + +
      • +
    -
    + +
    + +
    +
    + +
    + - -
    -
    - -
    - -
    -
    +
    +
    -
    -
    - -
    - -
    -
    - - +
    + + diff --git a/public/app/plugins/datasource/opentsdb/queryCtrl.js b/public/app/plugins/datasource/opentsdb/queryCtrl.js index 72ae9710d08..4f16983848f 100644 --- a/public/app/plugins/datasource/opentsdb/queryCtrl.js +++ b/public/app/plugins/datasource/opentsdb/queryCtrl.js @@ -8,6 +8,13 @@ function (angular, _, kbn) { var module = angular.module('grafana.controllers'); + module.directive('metricQueryEditorOpentsdb', function() { + return { + controller: 'OpenTSDBQueryCtrl', + templateUrl: 'app/plugins/datasource/opentsdb/partials/query.editor.html', + }; + }); + module.controller('OpenTSDBQueryCtrl', function($scope, $timeout) { $scope.init = function() { @@ -113,6 +120,7 @@ function (angular, _, kbn) { return errs; } + $scope.init(); }); }); diff --git a/public/css/less/tightform.less b/public/css/less/tightform.less index 515124b7ad9..7961cef775a 100644 --- a/public/css/less/tightform.less +++ b/public/css/less/tightform.less @@ -29,6 +29,7 @@ } } + .spaced-form { .tight-form { margin: 7px 0; @@ -209,3 +210,7 @@ select.tight-form-input { } } +.tight-form-align { + padding-left: 66px; +} +