tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added lost changes

This commit is contained in:
Arturo Gonzalez 2017-09-11 16:19:45 +02:00
parent 6b588e8c7b
commit 7445ff755f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -891,10 +891,17 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// Prepared to turn series with a checkbox // Prepared to turn series with a checkbox
// var showed = new Array(); // var showed = new Array();
var min_check = 0;
for (i = 0; i < values.length; i++) { for (i = 0; i < values.length; i++) {
var serie = values[i].split(separator); var serie = values[i].split(separator);
var aux = new Array(); var aux = new Array();
$.each(serie, function(i, v) { $.each(serie, function(i, v) {
if(v < 0){
if(min_check > parseFloat(v)){
min_check = v;
}
}
aux.push([i, v]); aux.push([i, v]);
}); });
@ -979,6 +986,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// showed[i] = true; // showed[i] = true;
} }
if(min_check != 0){
min_check = min_check -5;
}
// If threshold and up are the same, that critical or warning is disabled // If threshold and up are the same, that critical or warning is disabled
if (yellow_threshold == yellow_up) yellow_inverse = false; if (yellow_threshold == yellow_up) yellow_inverse = false;
if (red_threshold == red_up) red_inverse = false; if (red_threshold == red_up) red_inverse = false;
@ -1540,6 +1551,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
position: 'left', position: 'left',
font: font, font: font,
reserveSpace: true, reserveSpace: true,
min: min_check
}], }],
legend: { legend: {
position: 'se', position: 'se',
@ -2150,6 +2162,10 @@ function number_format(number, force_integer, unit) {
pos++; pos++;
number = number / 1000; number = number / 1000;
} }
else if (number <= -1000) {
pos++;
number = number / 1000;
}
else { else {
break; break;
} }