From c9b2cec5ff3d89f51b7d309fc579403008099766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 22 Aug 2015 08:34:20 +0200 Subject: [PATCH 1/2] fix(packaging): deb & rpm package did not mark ldap.toml config file as a configuration file, 2.1.1 & 2.1.2 upgrade overwrote it :(, fixes #2580 --- build.go | 1 + 1 file changed, 1 insertion(+) diff --git a/build.go b/build.go index 798faadfca0..ca6f52ecd89 100644 --- a/build.go +++ b/build.go @@ -221,6 +221,7 @@ func createPackage(options linuxPackageOptions) { "--license", "Apache 2.0", "--maintainer", "contact@grafana.org", "--config-files", options.configFilePath, + "--config-files", options.ldapFilePath, "--config-files", options.initdScriptFilePath, "--config-files", options.etcDefaultFilePath, "--config-files", options.systemdServiceFilePath, From ea187961da0586cdfc6dcd597441c23f5538adad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 21 Aug 2015 10:40:14 +0200 Subject: [PATCH 2/2] fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564 Conflicts: CHANGELOG.md --- CHANGELOG.md | 33 +++++++++++++++++-- .../features/templating/templateValuesSrv.js | 2 +- public/test/specs/templateValuesSrv-specs.js | 8 ++--- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 046d6f337ad..7a36fc79d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,39 @@ -# 2.1.2 (unreleased) +# 2.2 (unreleased) + +** New Feature: Mix data sources ** +A built in data source is now available named `-- Mixed --`, When picked in the metrics tab, +it allows you to add queries of differnet data source types & instances to the same graph/panel! +[Issue #436](https://github.com/grafana/grafana/issues/436) + +** Other new Features && Enhancements** +- [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 + +**Fixes** +- [Issue #2574](https://github.com/grafana/grafana/issues/2574). Snapshot: Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours +- [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy +- [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now +- [Issue #2565](https://github.com/grafana/grafana/issues/2565). TimePicker: Fix for when you applied custom time range it did not refreh dashboard +- [Issue #2563](https://github.com/grafana/grafana/issues/2563). Annotations: Fixed issue when html sanitizer failes for title to annotation body, now fallbacks to html escaping title and text +- [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url) + +**Breaking Changes** +- Notice to makers/users of custom data sources, there is a minor breaking change in 2.2 that +require an update to custom data sources for them to work in 2.2. [Read this doc](https://github.com/grafana/grafana/tree/master/docs/sources/datasources/plugin_api.md) for more on the +data source api change. + +# 2.1.3 (2015-08-24) + +**Fixes** +- [Issue #2580](https://github.com/grafana/grafana/issues/2580). Packaging: ldap.toml was not marked as config file and could be overwritten in upgrade +- [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url) + +# 2.1.2 (2015-08-20) **Fixes** - [Issue #2558](https://github.com/grafana/grafana/issues/2558). DragDrop: Fix for broken drag drop behavior - [Issue #2534](https://github.com/grafana/grafana/issues/2534). Templating: fix for setting template variable value via url and having repeated panels or rows - # 2.1.1 (2015-08-11) **Fixes** diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index eadf5954ed6..13e85d08a33 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -138,7 +138,7 @@ function (angular, _, kbn) { option.selected = false; if (_.isArray(variable.current.value)) { for (y = 0; y < variable.current.value.length; y++) { - value = variable.current.value[i]; + value = variable.current.value[y]; if (option.value === value) { option.selected = true; } diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index 813b3313ef0..07f9dd570f9 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -59,16 +59,16 @@ define([ beforeEach(function() { var dashboard = { templating: { list: [variable] } }; var urlParams = {}; - urlParams["var-apps"] = ["val1", "val2"]; + urlParams["var-apps"] = ["val2", "val1"]; ctx.$location.search = sinon.stub().returns(urlParams); ctx.service.init(dashboard); }); it('should update current value', function() { expect(variable.current.value.length).to.be(2); - expect(variable.current.value[0]).to.be("val1"); - expect(variable.current.value[1]).to.be("val2"); - expect(variable.current.text).to.be("val1 + val2"); + expect(variable.current.value[0]).to.be("val2"); + expect(variable.current.value[1]).to.be("val1"); + expect(variable.current.text).to.be("val2 + val1"); expect(variable.options[0].selected).to.be(true); expect(variable.options[1].selected).to.be(true); });