From 22be9436f71dbc58bc0258bfdf2582a028144e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 5 Sep 2017 15:16:04 +0200 Subject: [PATCH 1/3] Update CHANGELOG.md --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 837f121da2a..b17a86893ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ # 4.5.0 (unreleased) +# 4.5.0-beta1 (2017-09-05) + ## New Features * **Table panel**: Render cell values as links that can have an url template that uses variables from current table row. [#3754](https://github.com/grafana/grafana/issues/3754) @@ -36,11 +38,6 @@ * **Modals**: Maintain scroll position after opening/leaving modal [#8800](https://github.com/grafana/grafana/issues/8800) * **Templating**: You cannot select data source variables as data source for other template variables [#7510](https://github.com/grafana/grafana/issues/7510) - -# 4.4.4 (unreleased) - -## Bug Fixes - * **MySQL/Postgres**: Fix for max_idle_conn option default which was wrongly set to zero which does not mean unlimited but means zero, which in practice kind of disables connection pooling, which is not good. Fixes [#8513](https://github.com/grafana/grafana/issues/8513) # 4.4.3 (2017-08-07) From ec64dc8fae82de1ad0418734cfddc002798e43f7 Mon Sep 17 00:00:00 2001 From: Sergey Korobov Date: Tue, 5 Sep 2017 20:34:55 +0300 Subject: [PATCH 2/3] Fix sortByName and percentileOfSeries in gfunc.js (#9169) Fixing type of parameters from "select" to "boolean" for working with carbonapi (like it was done in summarize function) + some commas prettify. --- public/app/plugins/datasource/graphite/gfunc.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/graphite/gfunc.js b/public/app/plugins/datasource/graphite/gfunc.js index bbf3c034310..5186550ae0a 100644 --- a/public/app/plugins/datasource/graphite/gfunc.js +++ b/public/app/plugins/datasource/graphite/gfunc.js @@ -139,8 +139,8 @@ function (_, $) { addFuncDef({ name: 'percentileOfSeries', category: categories.Combine, - params: [{ name: "n", type: "int" }, { name: "interpolate", type: "select", options: ["true", "false"] }], - defaultParams: [95, "false"] + params: [{ name: 'n', type: 'int' }, { name: 'interpolate', type: 'boolean', options: ['true', 'false'] }], + defaultParams: [95, 'false'] }); addFuncDef({ @@ -261,8 +261,8 @@ function (_, $) { addFuncDef({ name: 'sortByName', category: categories.Special, - params: [{ name: "natural", type: "select", options: ["true", "false"], optional: true }], - defaultParams: ["false"] + params: [{ name: 'natural', type: 'boolean', options: ['true', 'false'], optional: true }], + defaultParams: ['false'] }); addFuncDef({ From 82d365bdb871d6e212ca4afbdc2215959516f81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 5 Sep 2017 21:57:32 +0200 Subject: [PATCH 3/3] fix: graph right y label is now correctly possitioned, fixes #9172 --- public/sass/components/_panel_graph.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss index 9ecea98c894..5f9178df2f7 100644 --- a/public/sass/components/_panel_graph.scss +++ b/public/sass/components/_panel_graph.scss @@ -181,7 +181,7 @@ } .graph-legend { - margin: 0; + margin: 0 0 0 1rem; } .graph-legend-series { @@ -321,7 +321,7 @@ .left-yaxis-label { top: 50%; - left: 0; + left: 2px; transform: translateX(-50%) translateY(-50%) rotate(-90deg); // this is needed for phantomsjs 2.1 -webkit-transform: translateX(-50%) translateY(-50%) rotate(-90deg); @@ -329,7 +329,7 @@ .right-yaxis-label { top: 50%; - right: 0; + right: 2px; transform: translateX(50%) translateY(-50%) rotate(90deg); // this is needed for phantomsjs 2.1 -webkit-transform: translateX(50%) translateY(-50%) rotate(90deg); @@ -339,7 +339,7 @@ display: inline-block; color: $text-color; font-size: $font-size-sm; - position: relative; + position: absolute; text-align: center; font-size: 12px; }