IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-06 14:20:53 +02:00
commit 9451e6af39
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -9,6 +9,8 @@
# 4.5.0 (unreleased) # 4.5.0 (unreleased)
# 4.5.0-beta1 (2017-09-05)
## New Features ## 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) * **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) * **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) * **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) * **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) # 4.4.3 (2017-08-07)

8
public/app/plugins/datasource/graphite/gfunc.js
View File

@ -139,8 +139,8 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'percentileOfSeries', name: 'percentileOfSeries',
category: categories.Combine, category: categories.Combine,
params: [{ name: "n", type: "int" }, { name: "interpolate", type: "select", options: ["true", "false"] }], params: [{ name: 'n', type: 'int' }, { name: 'interpolate', type: 'boolean', options: ['true', 'false'] }],
defaultParams: [95, "false"] defaultParams: [95, 'false']
}); });
addFuncDef({ addFuncDef({
@ -261,8 +261,8 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'sortByName', name: 'sortByName',
category: categories.Special, category: categories.Special,
params: [{ name: "natural", type: "select", options: ["true", "false"], optional: true }], params: [{ name: 'natural', type: 'boolean', options: ['true', 'false'], optional: true }],
defaultParams: ["false"] defaultParams: ['false']
}); });
addFuncDef({ addFuncDef({

8
public/sass/components/_panel_graph.scss
View File

@ -181,7 +181,7 @@
} }
.graph-legend { .graph-legend {
margin: 0; margin: 0 0 0 1rem;
} }
.graph-legend-series { .graph-legend-series {
@ -321,7 +321,7 @@
.left-yaxis-label { .left-yaxis-label {
top: 50%; top: 50%;
left: 0; left: 2px;
transform: translateX(-50%) translateY(-50%) rotate(-90deg); transform: translateX(-50%) translateY(-50%) rotate(-90deg);
// this is needed for phantomsjs 2.1 // this is needed for phantomsjs 2.1
-webkit-transform: translateX(-50%) translateY(-50%) rotate(-90deg); -webkit-transform: translateX(-50%) translateY(-50%) rotate(-90deg);
@ -329,7 +329,7 @@
.right-yaxis-label { .right-yaxis-label {
top: 50%; top: 50%;
right: 0; right: 2px;
transform: translateX(50%) translateY(-50%) rotate(90deg); transform: translateX(50%) translateY(-50%) rotate(90deg);
// this is needed for phantomsjs 2.1 // this is needed for phantomsjs 2.1
-webkit-transform: translateX(50%) translateY(-50%) rotate(90deg); -webkit-transform: translateX(50%) translateY(-50%) rotate(90deg);
@ -339,7 +339,7 @@
display: inline-block; display: inline-block;
color: $text-color; color: $text-color;
font-size: $font-size-sm; font-size: $font-size-sm;
position: relative; position: absolute;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
} }