From 721b37a08e3f3530a1a37c17f9af08a673d6ea4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 30 Nov 2015 10:14:42 +0100 Subject: [PATCH] feat(influxdb): new editor now supports field and tag lookup again --- .../datasource/influxdb/influx_query.ts | 22 +++++++++--- .../influxdb/partials/query.editor.html | 4 +-- .../plugins/datasource/influxdb/query_ctrl.js | 19 +++++++---- .../plugins/datasource/influxdb/query_part.ts | 4 +-- .../datasource/influxdb/query_part_editor.js | 34 +++++++++++++------ 5 files changed, 59 insertions(+), 24 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts index e4b798feb95..74dc8d9293a 100644 --- a/public/app/plugins/datasource/influxdb/influx_query.ts +++ b/public/app/plugins/datasource/influxdb/influx_query.ts @@ -1,11 +1,8 @@ /// -/// import _ = require('lodash'); import queryPart = require('./query_part'); -declare var InfluxQueryBuilder: any; - class InfluxQuery { target: any; selectModels: any[]; @@ -76,6 +73,23 @@ class InfluxQuery { } removeGroupByPart(part, index) { + var categories = queryPart.getCategories(); + + if (part.def.type === 'time') { + // remove fill + this.target.groupBy = _.filter(this.target.groupBy, (g: any) => g.type !== 'fill'); + // remove aggregations + this.target.select = _.map(this.target.select, (s: any) => { + return _.filter(s, (part: any) => { + var partModel = queryPart.create(part); + if (partModel.def.category === categories.Aggregations) { + return false; + } + return true; + }); + }); + } + this.target.groupBy.splice(index, 1); this.updateProjection(); } @@ -166,7 +180,7 @@ class InfluxQuery { var measurement = target.measurement; if (!measurement.match('^/.*/') && !measurement.match(/^merge\(.*\)/)) { - measurement = '"' + measurement+ '"'; +measurement = '"' + measurement+ '"'; } query += ' FROM ' + measurement + ' WHERE '; diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index c77157324aa..0aeb8a44224 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -71,7 +71,7 @@ SELECT
  • - +
    • @@ -85,7 +85,7 @@ GROUP BY
  • - +
  • diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.js b/public/app/plugins/datasource/influxdb/query_ctrl.js index bf89b550db3..38f87ecd84e 100644 --- a/public/app/plugins/datasource/influxdb/query_ctrl.js +++ b/public/app/plugins/datasource/influxdb/query_ctrl.js @@ -124,12 +124,6 @@ function (angular, _, InfluxQueryBuilder, InfluxQuery, queryPart) { $scope.get_data(); }; - $scope.getFields = function() { - var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); - return $scope.datasource.metricFindQuery(fieldsQuery) - .then($scope.transformToSegments(false), $scope.handleQueryError); - }; - $scope.toggleQueryMode = function () { $scope.target.rawQuery = !$scope.target.rawQuery; }; @@ -140,6 +134,19 @@ function (angular, _, InfluxQueryBuilder, InfluxQuery, queryPart) { .then($scope.transformToSegments(true), $scope.handleQueryError); }; + $scope.getPartOptions = function(part) { + if (part.def.type === 'field') { + var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); + return $scope.datasource.metricFindQuery(fieldsQuery) + .then($scope.transformToSegments(true), $scope.handleQueryError); + } + if (part.def.type === 'tag') { + var tagsQuery = $scope.queryBuilder.buildExploreQuery('TAG_KEYS'); + return $scope.datasource.metricFindQuery(tagsQuery) + .then($scope.transformToSegments(true), $scope.handleQueryError); + } + }; + $scope.handleQueryError = function(err) { $scope.parserError = err.message || 'Failed to issue metric query'; return []; diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts index 1dd7c76808e..06a24465bb7 100644 --- a/public/app/plugins/datasource/influxdb/query_part.ts +++ b/public/app/plugins/datasource/influxdb/query_part.ts @@ -151,7 +151,7 @@ QueryPartDef.register({ type: 'field', addStrategy: addFieldStrategy, category: categories.Fields, - params: [{type: 'field'}], + params: [{type: 'field', dynamicLookup: true}], defaultParams: ['value'], renderer: fieldRenderer, }); @@ -202,7 +202,7 @@ QueryPartDef.register({ QueryPartDef.register({ type: 'tag', category: groupByTimeFunctions, - params: [{name: 'tag', type: 'string'}], + params: [{name: 'tag', type: 'string', dynamicLookup: true}], defaultParams: ['tag'], renderer: fieldRenderer, }); diff --git a/public/app/plugins/datasource/influxdb/query_part_editor.js b/public/app/plugins/datasource/influxdb/query_part_editor.js index 9fbe02acf21..9d81e315989 100644 --- a/public/app/plugins/datasource/influxdb/query_part_editor.js +++ b/public/app/plugins/datasource/influxdb/query_part_editor.js @@ -19,6 +19,7 @@ function (angular, _, $) { part: "=", removeAction: "&", partUpdated: "&", + getOptions: "&", }, link: function postLink($scope, elem) { var part = $scope.part; @@ -75,18 +76,32 @@ function (angular, _, $) { this.style.width = (3 + this.value.length) * 8 + 'px'; } - function addTypeahead($input, paramIndex) { - $input.attr('data-provide', 'typeahead'); + function addTypeahead($input, param, paramIndex) { + if (!param.options && !param.dynamicLookup) { + return; + } - var options = partDef.params[paramIndex].options; - if (partDef.params[paramIndex].type === 'int') { + var typeaheadSource = function (query, callback) { + if (param.options) { return param.options; } + + $scope.$apply(function() { + $scope.getOptions().then(function(result) { + var dynamicOptions = _.map(result, function(op) { return op.value; }); + callback(dynamicOptions); + }); + }); + }; + + $input.attr('data-provide', 'typeahead'); + var options = param.options; + if (param.type === 'int') { options = _.map(options, function(val) { return val.toString(); }); } $input.typeahead({ - source: options, + source: typeaheadSource, minLength: 0, - items: 20, + items: 1000, updater: function (value) { setTimeout(function() { inputBlur.call($input[0], paramIndex); @@ -98,7 +113,8 @@ function (angular, _, $) { var typeahead = $input.data('typeahead'); typeahead.lookup = function () { this.query = this.$element.val() || ''; - return this.process(this.source); + var items = this.source(this.query, $.proxy(this.process, this)); + return items ? this.process(items) : items; }; } @@ -144,9 +160,7 @@ function (angular, _, $) { $input.keypress(_.partial(inputKeyPress, index)); $paramLink.click(_.partial(clickFuncParam, index)); - if (partDef.params[index].options) { - addTypeahead($input, index); - } + addTypeahead($input, param, index); }); }