From 62ae80eeaec37f1fe2f4c87d426198129d4f3526 Mon Sep 17 00:00:00 2001 From: Liu Yubao Date: Thu, 17 Sep 2015 01:25:28 +0800 Subject: [PATCH 1/5] 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/5] 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) { From 4c0262cbd00b91ba69ba8f3df3f634335ded3ef9 Mon Sep 17 00:00:00 2001 From: raj dutt Date: Wed, 16 Sep 2015 23:46:48 -0400 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aae9cbb30f2..e5b08e7a3a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ it allows you to add queries of differnet data source types & instances to the s - See [Issue #2353](https://github.com/grafana/grafana/issues/2354) for more info. ** Other new Features && Enhancements** +- [Pull #2720](https://github.com/grafana/grafana/pull/2720). Admin: Initial basic quota support (per Org) - [Issue #2577](https://github.com/grafana/grafana/issues/2577). Panel: Resize handles in panel bottom right corners for easy width and height change - [Issue #2457](https://github.com/grafana/grafana/issues/2457). Admin: admin page for all grafana organizations (list / edit view) - [Issue #1186](https://github.com/grafana/grafana/issues/1186). Time Picker: New option `today`, will set time range from midnight to now From a7cc36f741d489f2c9142d632936a1a98d579e65 Mon Sep 17 00:00:00 2001 From: raj dutt Date: Wed, 16 Sep 2015 23:50:02 -0400 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5b08e7a3a0..fca413673ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -185,6 +185,10 @@ Grunt & Watch tasks: # 2.0.0-Beta1 (2015-03-30) +**Important Note** + +Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated backend server. Please read the [Documentation](http://docs.grafana.org) for more detailed about this SIGNIFCANT change to Grafana + **New features** - [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site - [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site From 7dc2b364136a73dc66d46898eb83a9bfd73e821c Mon Sep 17 00:00:00 2001 From: Eugen Dinca Date: Thu, 17 Sep 2015 16:50:09 -0400 Subject: [PATCH 5/5] Added maxSeries option for groupByNode function --- public/app/plugins/datasource/graphite/gfunc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/graphite/gfunc.js b/public/app/plugins/datasource/graphite/gfunc.js index 6c637c21130..748bd25fb8a 100644 --- a/public/app/plugins/datasource/graphite/gfunc.js +++ b/public/app/plugins/datasource/graphite/gfunc.js @@ -242,7 +242,7 @@ function (_, $) { { name: "function", type: "string", - options: ['sum', 'avg'] + options: ['sum', 'avg', 'maxSeries'] } ], defaultParams: [3, "sum"]