Merge branch 'gridmin' of github.com:kamaradclimber/grafana into kamaradclimber-gridmin

This commit is contained in:
Torkel Ödegaard
2014-05-10 01:56:27 +02:00
3 changed files with 6 additions and 3 deletions
+3
View File
@@ -9,6 +9,9 @@
- Fixes to filters and "All" option. It now never uses "*" as value, but all options in a {node1, node2, node3} expression (Issue #228, #359)
- Fix for InfluxDB query generation with columns containing dots or dashes (Issue #369, #348) - Thanks to @jbripley
- Improvement to series toggling, CTRL+MouseClick on series name will now hide all others (Issue #350)
- Graph default setting for Y-Min changed from zero to auto scalling (will not effect existing dashboards). (Issue #386) - thx @kamaradclimber
# 1.5.3 (2014-04-17)
- Add support for async scripted dashboards (Issue #274)
+2 -2
View File
@@ -48,7 +48,7 @@
"y_formats": ["short", "short"],
"grid": {
"max": null,
"min": 0
"min": null
},
"resolution": 100,
"lines": true,
@@ -150,4 +150,4 @@
"hide": false
},
"refresh": false
}
}
+1 -1
View File
@@ -97,7 +97,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
*/
grid : {
max: null,
min: 0,
min: null,
threshold1: null,
threshold2: null,
threshold1Color: 'rgba(216, 200, 27, 0.27)',