diff --git a/CHANGELOG.md b/CHANGELOG.md index 395a9812d75..667a2be7c0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ - [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 +**Change** +- [Issue #681](https://github.com/grafana/grafana/issues/681). Dashboard: The panel error bar has been replaced with a small error indicator, this indicator does not change panel height and is a lot less intrusive. Hover over it for short details, click on it for more details. + # 1.7.0-rc1 (2014-08-05) **New features or improvements** diff --git a/latest.json b/latest.json index c337a17fbdc..38e862a643a 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "version": "1.7.0-rc1", - "url": "http://grafanarel.s3.amazonaws.com/grafana-1.7.0-rc1.tar.gz" -} \ No newline at end of file + "version": "1.7.0", + "url": "http://grafanarel.s3.amazonaws.com/grafana-1.7.0" +} diff --git a/package.json b/package.json index f7cd3e36d83..31c552fe6c2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "1.7.0-rc1", + "version": "1.7.0", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" diff --git a/src/app/controllers/inspectCtrl.js b/src/app/controllers/inspectCtrl.js index e9a98506dab..d6034516a6b 100644 --- a/src/app/controllers/inspectCtrl.js +++ b/src/app/controllers/inspectCtrl.js @@ -1,7 +1,8 @@ define([ - 'angular' + 'angular', + 'lodash' ], -function (angular) { +function (angular, _) { 'use strict'; var module = angular.module('grafana.controllers'); @@ -28,6 +29,16 @@ function (angular) { return; } + if (_.isString(model.error.data)) { + $scope.response = model.error.data; + } + + if (model.error.config && model.error.config.params) { + $scope.request_parameters = _.map(model.error.config.params, function(value, key) { + return { key: key, value: value}; + }); + } + if (model.error.stack) { $scope.editor.index = 2; $scope.stack_trace = model.error.stack; @@ -72,4 +83,4 @@ function (angular) { }; }); -}); \ No newline at end of file +}); diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js index dc2534011d0..8054fd84314 100644 --- a/src/app/directives/grafanaPanel.js +++ b/src/app/directives/grafanaPanel.js @@ -15,16 +15,12 @@ function (angular, $) { var panelHeader = '