From 7bda2bb6a45d225de7a2f0e233d02a816202510d Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 8 Dec 2012 15:06:56 +0000 Subject: [PATCH] Don't scale the y axis for the cpu monitor --- js/server_status_monitor.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 2d8dff2d21..416f831781 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -192,7 +192,7 @@ AJAX.registerOnload('server_status_monitor.js', function() { nodes: [ { dataPoints: [{ type: 'cpu', name: 'loadavg'}] } ], - maxYLabel: 0 + maxYLabel: 100 }, 'memory': { @@ -1460,8 +1460,10 @@ AJAX.registerOnload('server_status_monitor.js', function() { // update chart options elem.chart['axes']['xaxis']['max'] = runtime.xmax; elem.chart['axes']['xaxis']['min'] = runtime.xmin; - elem.chart['axes']['yaxis']['max'] = Math.ceil(elem.maxYLabel*1.1); - elem.chart['axes']['yaxis']['tickInterval'] = Math.ceil(elem.maxYLabel*1.2/5); + if (elem.title !== PMA_messages['strSystemCPUUsage']) { + elem.chart['axes']['yaxis']['max'] = Math.ceil(elem.maxYLabel*1.1); + elem.chart['axes']['yaxis']['tickInterval'] = Math.ceil(elem.maxYLabel*1.2/5); + } i++; if (runtime.redrawCharts) {