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

feat(thresholds): more work on thresholds, within and outside types no work

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-08-11 22:22:15 +02:00
parent 7a5dda9e7c
commit 895cff78b6
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/panel/graph/graph.js
View File

@ -322,9 +322,10 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholds) {
var gtLimit = Infinity; var gtLimit = Infinity;
var ltLimit = -Infinity; var ltLimit = -Infinity;
var i, threshold, other;
for (var i = 0; i < panel.thresholds.length; i++) { for (i = 0; i < panel.thresholds.length; i++) {
var threshold = panel.thresholds[i]; threshold = panel.thresholds[i];
if (!_.isNumber(threshold.value)) { if (!_.isNumber(threshold.value)) {
continue; continue;
} }
@ -333,12 +334,26 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholds) {
switch(threshold.op) { switch(threshold.op) {
case 'gt': { case 'gt': {
limit = gtLimit; limit = gtLimit;
gtLimit = threshold.value; // if next threshold is less then op and greater value, then use that as limit
if (panel.thresholds.length > i+1) {
other = panel.thresholds[i+1];
if (other.value > threshold.value) {
limit = other.value;
ltLimit = limit;
}
}
break; break;
} }
case 'lt': { case 'lt': {
limit = ltLimit; limit = ltLimit;
ltLimit = threshold.value; // if next threshold is less then op and greater value, then use that as limit
if (panel.thresholds.length > i+1) {
other = panel.thresholds[i+1];
if (other.value < threshold.value) {
limit = other.value;
gtLimit = limit;
}
}
break; break;
} }
} }