IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Mike Kobyakov
2015-09-17 23:07:52 -07:00
parent f76374cd8f a7cc36f741
commit 5d516592d9
607 changed files with 71935 additions and 6257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/opentsdb/datasource.js
View File

@@ -3,6 +3,7 @@ define([
'lodash',
'kbn',
'moment',
'./directives',
'./queryCtrl',
],
function (angular, _, kbn) {
@@ -105,7 +106,7 @@ function (angular, _, kbn) {
OpenTSDBDatasource.prototype._performMetricKeyLookup = function(metric) {
if(!metric) { return $q.when([]); }
return this._get('/api/search/lookup', {m: metric}).then(function(result) {
return this._get('/api/search/lookup', {m: metric, limit: 1000}).then(function(result) {
result = result.data.results;
var tagks = [];
_.each(result, function(r) {