From 62ae80eeaec37f1fe2f4c87d426198129d4f3526 Mon Sep 17 00:00:00 2001 From: Liu Yubao Date: Thu, 17 Sep 2015 01:25:28 +0800 Subject: [PATCH 1/2] deduplicate tag value suggestions for OpenTSDB --- public/app/plugins/datasource/opentsdb/datasource.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index e91fa4b8ac7..879daf06c73 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -97,7 +97,9 @@ function (angular, _, kbn) { result = result.data.results; var tagvs = []; _.each(result, function(r) { - tagvs.push(r.tags[key]); + if (tagvs.indexOf(r.tags[key]) === -1) { + tagvs.push(r.tags[key]); + } }); return tagvs; }); From 4fccfbf54327e3450c5492056e521c9a8bdde134 Mon Sep 17 00:00:00 2001 From: Liu Yubao Date: Thu, 17 Sep 2015 01:36:36 +0800 Subject: [PATCH 2/2] increase limit to lookup unique metric tag values Default limit is 25 which is too small. Considering currently the /api/search/lookup query isn't narrowed down by selected tag keys and values (see https://github.com/grafana/grafana/pull/1433), the limit is set to 3000, this should be fine because people rarely create new graph panel. --- public/app/plugins/datasource/opentsdb/datasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 879daf06c73..612324e7543 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -93,7 +93,7 @@ function (angular, _, kbn) { var m = metric + "{" + key + "=*}"; - return this._get('/api/search/lookup', {m: m}).then(function(result) { + return this._get('/api/search/lookup', {m: m, limit: 3000}).then(function(result) { result = result.data.results; var tagvs = []; _.each(result, function(r) {