From db90fa71d453024183607cbddbddfe35aa8d55a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Aug 2014 14:16:54 +0200 Subject: [PATCH 1/5] General: Fix for refresh icon in IE browsers, Fixes #657 --- CHANGELOG.md | 3 ++- src/app/panels/timepicker/module.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 257564d41a1..70ce44c9f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # 1.7.0 (unreleased) **Fixes** -- [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading - [Issue #652](https://github.com/grafana/grafana/issues/652). Timepicker: Entering custom date range impossible when refresh is low (now is constantly reset) - [Issue #450](https://github.com/grafana/grafana/issues/450). Graph: Tooltip does not disappear sometimes and would get stuck +- [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading +- [Issue #657](https://github.com/grafana/grafana/issues/657). General: Fix for refresh icon in IE browsers # 1.7.0-rc1 (2014-08-05) diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html index 5c6513bf666..e9bd50a2fb8 100644 --- a/src/app/panels/timepicker/module.html +++ b/src/app/panels/timepicker/module.html @@ -48,7 +48,7 @@
  • - +
    • From 5a125c7fe522a946d3076c413c0435134676d1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Aug 2014 15:05:37 +0200 Subject: [PATCH 2/5] added coveralls badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16c20127ab0..1f3af7146e2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[Grafana](http://grafana.org) [![Build Status](https://api.travis-ci.org/grafana/grafana.png)](https://travis-ci.org/grafana/grafana) [![Gittip](http://img.shields.io/gittip/torkelo.svg)](https://www.gittip.com/torkelo) +[Grafana](http://grafana.org) [![Build Status](https://api.travis-ci.org/grafana/grafana.png)](https://travis-ci.org/grafana/grafana) [![Coverage Status](https://coveralls.io/repos/grafana/grafana/badge.png?branch=develop)](https://coveralls.io/r/grafana/grafana?branch=develop) ================ [Website](http://grafana.org) | [Twitter](http://twitter.com/grafana) | From 3fffd08ae42419d3e47836575dba73e81689eb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 8 Aug 2014 07:19:03 +0200 Subject: [PATCH 3/5] Annotation: filter field is not interpreting in elasticsearch query, Fixes #661 --- CHANGELOG.md | 1 + src/app/services/elasticsearch/es-datasource.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ce44c9f5a..776427d24d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [Issue #450](https://github.com/grafana/grafana/issues/450). Graph: Tooltip does not disappear sometimes and would get stuck - [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading - [Issue #657](https://github.com/grafana/grafana/issues/657). General: Fix for refresh icon in IE browsers +- [Issue #661](https://github.com/grafana/grafana/issues/661). Annotations: Elasticsearch querystring with filter template replacements was not interpolated # 1.7.0-rc1 (2014-08-05) diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js index a7506966abe..91e80da6f82 100644 --- a/src/app/services/elasticsearch/es-datasource.js +++ b/src/app/services/elasticsearch/es-datasource.js @@ -73,8 +73,9 @@ function (angular, _, $, config, kbn, moment) { to: rangeUnparsed.to, }; + var queryInterpolated = filterSrv.applyTemplateToTarget(queryString); var filter = { "bool": { "must": [{ "range": range }] } }; - var query = { "bool": { "should": [{ "query_string": { "query": queryString } }] } }; + var query = { "bool": { "should": [{ "query_string": { "query": queryInterpolated } }] } }; var data = { "query" : { "filtered": { "query" : query, "filter": filter } }, "size": 100 }; return this._request('POST', '/_search', annotation.index, data).then(function(results) { From 675688cb809820d9b554df0afc9ab058a3809559 Mon Sep 17 00:00:00 2001 From: Christophe Furmaniak Date: Fri, 8 Aug 2014 14:58:03 +0200 Subject: [PATCH 4/5] fix #660 by checking if options is undefined - a complete fix with a consistent support of alias in all use cases is not obvious (see #660 for explanations) --- src/app/services/opentsdb/opentsdbDatasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js index c46c3084678..4228e566ff6 100644 --- a/src/app/services/opentsdb/opentsdbDatasource.js +++ b/src/app/services/opentsdb/opentsdbDatasource.js @@ -106,7 +106,7 @@ function (angular, _, kbn) { } function createMetricLabel(metric, tagData, options) { - if (options.alias) { + if (!_.isUndefined(options) && options.alias) { return options.alias; } From 966ba97b2cda6694074be1e224a6b8b19d600295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 8 Aug 2014 15:23:39 +0200 Subject: [PATCH 5/5] updated changelog for PR #666, Closes #660 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 776427d24d7..395a9812d75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading - [Issue #657](https://github.com/grafana/grafana/issues/657). General: Fix for refresh icon in IE browsers - [Issue #661](https://github.com/grafana/grafana/issues/661). Annotations: Elasticsearch querystring with filter template replacements was not interpolated +- [Issue #660](https://github.com/grafana/grafana/issues/660). OpenTSDB: fix opentsdb queries that returned more than one series # 1.7.0-rc1 (2014-08-05)