mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
InfluxDB: series lookup & typeahead is now handled by influxdb list series regex queries, Closes #888
This commit is contained in:
parent
e9c7523646
commit
920689b80e
@ -83,10 +83,11 @@ function (angular) {
|
||||
};
|
||||
|
||||
$scope.listSeries = function(query, callback) {
|
||||
if (!seriesList || query === '') {
|
||||
if (query !== '') {
|
||||
seriesList = [];
|
||||
$scope.datasource.listSeries().then(function(series) {
|
||||
$scope.datasource.listSeries(query).then(function(series) {
|
||||
seriesList = series;
|
||||
console.log(series);
|
||||
callback(seriesList);
|
||||
});
|
||||
}
|
||||
|
@ -64,6 +64,8 @@
|
||||
ng-model="target.series"
|
||||
spellcheck='false'
|
||||
bs-typeahead="listSeries"
|
||||
match-all="true"
|
||||
min-length="3"
|
||||
placeholder="series name"
|
||||
data-min-length=0 data-items=100
|
||||
ng-blur="seriesBlur()">
|
||||
|
@ -85,8 +85,13 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
|
||||
});
|
||||
};
|
||||
|
||||
InfluxDatasource.prototype.listSeries = function() {
|
||||
return this._seriesQuery('list series').then(function(data) {
|
||||
InfluxDatasource.prototype.listSeries = function(query) {
|
||||
// wrap in regex
|
||||
if (query && query.length > 0 && query[0] !== '/') {
|
||||
query = '/' + query + '/';
|
||||
}
|
||||
|
||||
return this._seriesQuery('list series ' + query).then(function(data) {
|
||||
if (!data || data.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user