tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gauge graphs warning and critical ranges. Ticket #4281

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-12-19 16:35:46 +01:00
parent c949a7eef5
commit cf8cdd8ae6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/graphs/pandora.d3.js
View File

@ -859,7 +859,7 @@ function sunburst (recipient, data, width, height) {
function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,min_critical,max_critical,font_size, height, font) function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,min_critical,max_critical,font_size, height, font)
{ {
var gauges; var gauges;
var config = var config =
{ {
size: height, size: height,
@ -880,7 +880,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi
//var range = config.max - config.min; //var range = config.max - config.min;
var range = config.max - config.min; var range = config.max - config.min;
if (value != false) { if (value !== false) {
if ( min_warning > 0 ) { if ( min_warning > 0 ) {
config.yellowZones = [{ from: min_warning, to: max_warning }]; config.yellowZones = [{ from: min_warning, to: max_warning }];
} }
@ -888,6 +888,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi
config.redZones = [{ from: min_critical, to: max_critical }]; config.redZones = [{ from: min_critical, to: max_critical }];
} }
} }
gauges = new Gauge(name, config, font); gauges = new Gauge(name, config, font);
gauges.render(); gauges.render();
gauges.redraw(value); gauges.redraw(value);
@ -927,8 +928,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi
config = false; config = false;
} }
function createGauges(data, width, height, font_size, no_data_image, font) function createGauges(data, width, height, font_size, no_data_image, font) {
{
var nombre,label,minimun_warning,maximun_warning,minimun_critical,maximun_critical, var nombre,label,minimun_warning,maximun_warning,minimun_critical,maximun_critical,
mininum,maxinum,valor; mininum,maxinum,valor;
@ -948,8 +948,10 @@ function createGauges(data, width, height, font_size, no_data_image, font)
maximun_warning = Math.round(parseFloat( data[key].max_warning ),2); maximun_warning = Math.round(parseFloat( data[key].max_warning ),2);
minimun_critical = Math.round(parseFloat( data[key].min_critical ),2); minimun_critical = Math.round(parseFloat( data[key].min_critical ),2);
maximun_critical = Math.round(parseFloat( data[key].max_critical ),2); maximun_critical = Math.round(parseFloat( data[key].max_critical ),2);
mininum = Math.round(parseFloat(data[key].min),2); mininum = Math.round(parseFloat(data[key].min),2);
maxinum = Math.round(parseFloat(data[key].max),2); maxinum = Math.round(parseFloat(data[key].max),2);
valor = Math.round(parseFloat(data[key].value),2); valor = Math.round(parseFloat(data[key].value),2);
if (maxinum == 0) if (maxinum == 0)
maxinum = 100; maxinum = 100;