From 061b4519c97ea7fd7fa80e18dfd5863feb6e27ef Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 28 Aug 2012 01:37:43 +0530 Subject: [PATCH 1/7] Replace some highchart specific chart settings with jqplot ones --- js/server_status_monitor.js | 119 +++++++++++++----------------------- 1 file changed, 43 insertions(+), 76 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index e5c160d87f..c22e9e5769 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -66,21 +66,15 @@ $(function() { // Query cache efficiency 'qce': { title: PMA_messages['strQueryCacheEfficiency'], - nodes: [ { - name: PMA_messages['strQueryCacheEfficiency'], - dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}], - unit: '%', - transformFn: 'qce' + series: [ { + label: PMA_messages['strQueryCacheEfficiency'] } ] }, // Query cache usage 'qcu': { title: PMA_messages['strQueryCacheUsage'], - nodes: [ { - name: PMA_messages['strQueryCacheUsed'], - dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}], - unit: '%', - transformFn: 'qcu' + series: [ { + label: PMA_messages['strQueryCacheUsed'] } ] } }; @@ -91,41 +85,35 @@ $(function() { $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - nodes: [ { - name: PMA_messages['strAverageLoad'], - dataPoints: [{ type: 'cpu', name: 'loadavg'}], - unit: '%' + series: [ { + label: PMA_messages['strAverageLoad'] } ] }, 'memory': { title: PMA_messages['strSystemMemory'], - nodes: [ { - name: PMA_messages['strTotalMemory'], - dataPoints: [{ type: 'memory', name: 'MemTotal' }], - valueDivisor: 1024, - unit: PMA_messages['strMiB'] + series: [ { + label: PMA_messages['strTotalMemory'], + fill:true, + stackSeries: true }, { dataType: 'memory', - name: PMA_messages['strUsedMemory'], - dataPoints: [{ type: 'memory', name: 'MemUsed' }], - valueDivisor: 1024, - unit: PMA_messages['strMiB'] + label: PMA_messages['strUsedMemory'], + fill:true, + stackSeries: true } ] }, 'swap': { title: PMA_messages['strSystemSwap'], - nodes: [ { - name: PMA_messages['strTotalSwap'], - dataPoints: [{ type: 'memory', name: 'SwapTotal' }], - valueDivisor: 1024, - unit: PMA_messages['strMiB'] + series: [ { + label: PMA_messages['strTotalSwap'], + fill:true, + stackSeries: true }, { - name: PMA_messages['strUsedSwap'], - dataPoints: [{ type: 'memory', name: 'SwapUsed' }], - valueDivisor: 1024, - unit: PMA_messages['strMiB'] + label: PMA_messages['strUsedSwap'], + fill:true, + stackSeries: true } ] } }); @@ -135,51 +123,26 @@ $(function() { $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - nodes: [ { - name: PMA_messages['strAverageLoad'], - dataPoints: [{ type: 'cpu', name: 'irrelevant' }], - unit: '%', - transformFn: 'cpu-linux' + series: [ { + label: PMA_messages['strAverageLoad'] } ] }, 'memory': { title: PMA_messages['strSystemMemory'], - nodes: [ - { name: PMA_messages['strUsedMemory'], dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }, - { name: PMA_messages['strCachedMemory'], dataPoints: [{ type: 'memory', name: 'Cached' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }, - { name: PMA_messages['strBufferedMemory'], dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }, - { name: PMA_messages['strFreeMemory'], dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] } - ], - settings: { - chart: { - type: 'area', - animation: false - }, - plotOptions: { - area: { - stacking: 'percent' - } - } - } + series: [ + { label: PMA_messages['strUsedMemory'], fill:true, stackSeries: true}, + { label: PMA_messages['strCachedMemory'], fill:true, stackSeries: true}, + { label: PMA_messages['strBufferedMemory'], fill:true, stackSeries: true}, + { label: PMA_messages['strFreeMemory'], fill:true, stackSeries: true} + ] }, 'swap': { title: PMA_messages['strSystemSwap'], - nodes: [ - { name: PMA_messages['strUsedSwap'], dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }, - { name: PMA_messages['strCachedSwap'], dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }, - { name: PMA_messages['strFreeSwap'], dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] } - ], - settings: { - chart: { - type: 'area', - animation: false - }, - plotOptions: { - area: { - stacking: 'percent' - } - } - } + series: [ + { label: PMA_messages['strUsedSwap'], fill:true, stackSeries: true}, + { label: PMA_messages['strCachedSwap'], fill:true, stackSeries: true}, + { label: PMA_messages['strFreeSwap'], fill:true, stackSeries: true} + ] } }); break; @@ -188,18 +151,18 @@ $(function() { // Default setting for the chart grid defaultChartGrid = { 'c0': { title: PMA_messages['strQuestions'], - nodes: [{name: PMA_messages['strQuestions'], dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }] + series: [{label: PMA_messages['strQuestions']}] }, 'c1': { title: PMA_messages['strChartConnectionsTitle'], - nodes: [ { name: PMA_messages['strConnections'], dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' }, - { name: PMA_messages['strProcesses'], dataPoints: [{ type: 'proc', name: 'processes' }] } ] + series: [ { label: PMA_messages['strConnections']}, + { label: PMA_messages['strProcesses']} ] }, 'c2': { title: PMA_messages['strTraffic'], - nodes: [ - { name: PMA_messages['strBytesSent'], dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] }, - { name: PMA_messages['strBytesReceived'], dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] } + series: [ + { label: PMA_messages['strBytesSent']}, + { label: PMA_messages['strBytesReceived']} ] } }; @@ -1092,6 +1055,10 @@ $(function() { rendererOptions: { smooth: true } + }, + highlighter: { + show: true, + showTooltip: false } }; From a293fef4346551561357e7440801a8a491efe6b1 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 28 Aug 2012 23:04:05 +0530 Subject: [PATCH 2/7] Remove y axis label and add title --- js/server_status_monitor.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index c22e9e5769..8eb955b838 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1038,6 +1038,7 @@ $(function() { } var settings1 = { + title: chartObj.title, axes: { xaxis: { renderer: $.jqplot.DateAxisRenderer, @@ -1046,9 +1047,7 @@ $(function() { } }, yaxis: { - autoscale:true, - label: PMA_messages['strTotalCount'], - labelRenderer: $.jqplot.CanvasAxisLabelRenderer, + min:0 } }, seriesDefaults: { From f9e197fa77cbafefe4ef88254b31cfe60cf559a7 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 28 Aug 2012 23:12:26 +0530 Subject: [PATCH 3/7] jqplot: set min, max values for x axis --- js/server_status_monitor.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 8eb955b838..116e52c6b9 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1044,7 +1044,10 @@ $(function() { renderer: $.jqplot.DateAxisRenderer, tickOptions: { formatString: '%H:%M:%S' - } + }, + min: runtime.xmin, + max: runtime.xmax, + tickInterval: '10 seconds' }, yaxis: { min:0 @@ -1246,10 +1249,8 @@ $(function() { } // update chart options - var interval = (((runtime.xmax - runtime.xmin)/runtime.gridMaxPoints) / 1000); elem.chart['axes']['xaxis']['max'] = runtime.xmax; elem.chart['axes']['xaxis']['min'] = runtime.xmin; - elem.chart['axes']['xaxis']['tickInterval'] = interval + " seconds"; i++; runtime.charts[orderKey].numPoints++; if (runtime.redrawCharts) { From 4d2c49723c566f82d3ca40962678a4d76f366b2c Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 29 Aug 2012 00:43:25 +0530 Subject: [PATCH 4/7] jqplot: add wrongly removed node parameters --- js/server_status_monitor.js | 86 ++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 21 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 116e52c6b9..1a9d890782 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -68,14 +68,20 @@ $(function() { title: PMA_messages['strQueryCacheEfficiency'], series: [ { label: PMA_messages['strQueryCacheEfficiency'] - } ] + } ], + nodes: {dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}], + transformFn: 'qce' + } }, // Query cache usage 'qcu': { title: PMA_messages['strQueryCacheUsage'], series: [ { label: PMA_messages['strQueryCacheUsed'] - } ] + } ], + nodes: {dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}], + transformFn: 'qcu' + } } }; @@ -87,7 +93,8 @@ $(function() { title: PMA_messages['strSystemCPUUsage'], series: [ { label: PMA_messages['strAverageLoad'] - } ] + } ], + nodes: {dataPoints: [{ type: 'cpu', name: 'loadavg'}]} }, 'memory': { @@ -101,7 +108,11 @@ $(function() { label: PMA_messages['strUsedMemory'], fill:true, stackSeries: true - } ] + } ], + nodes: { dataPoints: [{ type: 'memory', name: 'MemTotal' }, + { type: 'memory', name: 'MemUsed' }], + valueDivisor: [1024, 1024] + } }, 'swap': { @@ -114,7 +125,10 @@ $(function() { label: PMA_messages['strUsedSwap'], fill:true, stackSeries: true - } ] + } ], + nodes: { dataPoints: [{ type: 'memory', name: 'SwapTotal' }, + { type: 'memory', name: 'SwapUsed' }] + } } }); break; @@ -125,7 +139,10 @@ $(function() { title: PMA_messages['strSystemCPUUsage'], series: [ { label: PMA_messages['strAverageLoad'] - } ] + } ], + nodes: { dataPoints: [{ type: 'cpu', name: 'irrelevant' }], + transformFn: 'cpu-linux' + } }, 'memory': { title: PMA_messages['strSystemMemory'], @@ -134,15 +151,29 @@ $(function() { { label: PMA_messages['strCachedMemory'], fill:true, stackSeries: true}, { label: PMA_messages['strBufferedMemory'], fill:true, stackSeries: true}, { label: PMA_messages['strFreeMemory'], fill:true, stackSeries: true} - ] - }, + ], + nodes: {dataPoints: [{ type: 'memory', name: 'MemUsed' }, + { type: 'memory', name: 'Cached' }, + { type: 'memory', name: 'Buffers' }, + { type: 'memory', name: 'MemFree' } + ], + valueDivisor: [1024, 1024, 1024, 1024] + } + + }, 'swap': { title: PMA_messages['strSystemSwap'], series: [ { label: PMA_messages['strUsedSwap'], fill:true, stackSeries: true}, { label: PMA_messages['strCachedSwap'], fill:true, stackSeries: true}, { label: PMA_messages['strFreeSwap'], fill:true, stackSeries: true} - ] + ], + nodes: {dataPoints: [{ type: 'memory', name: 'SwapUsed' }, + { type: 'memory', name: 'SwapCached' }, + { type: 'memory', name: 'SwapFree' } + ], + valueDivisor: [1024, 1024, 1024] + } } }); break; @@ -151,19 +182,33 @@ $(function() { // Default setting for the chart grid defaultChartGrid = { 'c0': { title: PMA_messages['strQuestions'], - series: [{label: PMA_messages['strQuestions']}] + series: [{label: PMA_messages['strQuestions']}], + nodes: {dataPoints: [{ type: 'statusvar', name: 'Questions' }], + display: ['differential'] + } }, 'c1': { title: PMA_messages['strChartConnectionsTitle'], series: [ { label: PMA_messages['strConnections']}, - { label: PMA_messages['strProcesses']} ] + { label: PMA_messages['strProcesses']} ], + nodes: {dataPoints: [{ type: 'statusvar', name: 'Connections' }, + { type: 'proc', name: 'processes' } + ], + display: ['differential', ''] + } }, 'c2': { title: PMA_messages['strTraffic'], series: [ { label: PMA_messages['strBytesSent']}, { label: PMA_messages['strBytesReceived']} - ] + ], + nodes: {dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }, + { type: 'proc', name: 'Bytes_received' } + ], + valueDivisor: [1024, 1024], + display: ['differential', 'differential'] + } } }; @@ -1195,7 +1240,7 @@ $(function() { return; } // Draw all series - for (var j = 0; j < elem.nodes.length; j++) { + for (var j = 0; j < elem.series.length; j++) { // Update x-axis if (i == 0 && j == 0) { if (oldChartData == null) { @@ -1212,9 +1257,9 @@ $(function() { /* Calculate y value */ // If transform function given, use it - if (elem.nodes[j].transformFn) { + if (elem.nodes.transformFn[j]) { value = chartValueTransform( - elem.nodes[j].transformFn, + elem.nodes.transformFn[j], chartData[key][j], // Check if first iteration (oldChartData==null), or if newly added chart oldChartData[key]==null (oldChartData == null || oldChartData[key] == null ? null : oldChartData[key][j]) @@ -1225,15 +1270,15 @@ $(function() { } else { value = parseFloat(chartData[key][j][0].value); - if (elem.nodes[j].display == 'differential') { + if (elem.nodes.display[j] == 'differential') { if (oldChartData == null || oldChartData[key] == null) { continue; } value -= oldChartData[key][j][0].value; } - if (elem.nodes[j].valueDivisor) { - value = value / elem.nodes[j].valueDivisor; + if (elem.nodes.valueDivisor[j]) { + value = value / elem.nodes.valueDivisor[j]; } } @@ -1254,7 +1299,6 @@ $(function() { i++; runtime.charts[orderKey].numPoints++; if (runtime.redrawCharts) { - elem.chart.redraw(); elem.chart.replot(); } }); @@ -1311,8 +1355,8 @@ $(function() { var chartID = 0; $.each(runtime.charts, function(key, chart) { runtime.dataList[chartID] = []; - for(var i=0; i < chart.nodes.length; i++) { - runtime.dataList[chartID][i] = chart.nodes[i].dataPoints; + for(var i=0; i < chart.series.length; i++) { + runtime.dataList[chartID][i] = chart.nodes.dataPoints[i]; } runtime.charts[key].chartID = chartID; chartID++; From c418319bb6dcadd522936ef7fafb48f18dabee63 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 29 Aug 2012 01:20:41 +0530 Subject: [PATCH 5/7] jqplot: remove highcharts settings from chart object --- js/server_status_monitor.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 1a9d890782..a067106a79 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -986,7 +986,7 @@ $(function() { /* Adds a chart to the chart grid */ function addChart(chartObj, initialize) { - series = []; +/* series = []; for (var j = 0; j'); } - $('table#chartGrid tr:last').append('
'); + $('table#chartGrid tr:last').append('
'); } - //chartObj.chart = PMA_createChart(settings); - chartObj.chart = $.jqplot(settings.chart.renderTo, [[0,0]], settings1); + chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, [[0,0]], settings); chartObj.numPoints = 0; - + if (initialize != true) { runtime.charts['c' + runtime.chartAI] = chartObj; buildRequiredDataList(); From 4c283ca5602f4dcf80c6b22d2543bc8f102f5c66 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 30 Aug 2012 01:27:15 +0530 Subject: [PATCH 6/7] jqplot: fix broken data refresh, still not displayed properly in charts --- js/server_status_monitor.js | 96 +++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 52 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index a067106a79..b4d012f425 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -69,9 +69,10 @@ $(function() { series: [ { label: PMA_messages['strQueryCacheEfficiency'] } ], - nodes: {dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}], + nodes: [ { + dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}], transformFn: 'qce' - } + } ] }, // Query cache usage 'qcu': { @@ -79,9 +80,10 @@ $(function() { series: [ { label: PMA_messages['strQueryCacheUsed'] } ], - nodes: {dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}], + nodes: [ { + dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}], transformFn: 'qcu' - } + } ] } }; @@ -94,7 +96,9 @@ $(function() { series: [ { label: PMA_messages['strAverageLoad'] } ], - nodes: {dataPoints: [{ type: 'cpu', name: 'loadavg'}]} + nodes: [ { + dataPoints: [{ type: 'cpu', name: 'loadavg'}] + } ] }, 'memory': { @@ -109,10 +113,9 @@ $(function() { fill:true, stackSeries: true } ], - nodes: { dataPoints: [{ type: 'memory', name: 'MemTotal' }, - { type: 'memory', name: 'MemUsed' }], - valueDivisor: [1024, 1024] - } + nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 } + ] }, 'swap': { @@ -126,9 +129,9 @@ $(function() { fill:true, stackSeries: true } ], - nodes: { dataPoints: [{ type: 'memory', name: 'SwapTotal' }, - { type: 'memory', name: 'SwapUsed' }] - } + nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }]}, + { dataPoints: [{ type: 'memory', name: 'SwapUsed' }]} + ] } }); break; @@ -140,9 +143,7 @@ $(function() { series: [ { label: PMA_messages['strAverageLoad'] } ], - nodes: { dataPoints: [{ type: 'cpu', name: 'irrelevant' }], - transformFn: 'cpu-linux' - } + nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}] }, 'memory': { title: PMA_messages['strSystemMemory'], @@ -152,14 +153,12 @@ $(function() { { label: PMA_messages['strBufferedMemory'], fill:true, stackSeries: true}, { label: PMA_messages['strFreeMemory'], fill:true, stackSeries: true} ], - nodes: {dataPoints: [{ type: 'memory', name: 'MemUsed' }, - { type: 'memory', name: 'Cached' }, - { type: 'memory', name: 'Buffers' }, - { type: 'memory', name: 'MemFree' } - ], - valueDivisor: [1024, 1024, 1024, 1024] - } - + nodes: [ + { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'Cached' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 } + ] }, 'swap': { title: PMA_messages['strSystemSwap'], @@ -168,12 +167,11 @@ $(function() { { label: PMA_messages['strCachedSwap'], fill:true, stackSeries: true}, { label: PMA_messages['strFreeSwap'], fill:true, stackSeries: true} ], - nodes: {dataPoints: [{ type: 'memory', name: 'SwapUsed' }, - { type: 'memory', name: 'SwapCached' }, - { type: 'memory', name: 'SwapFree' } - ], - valueDivisor: [1024, 1024, 1024] - } + nodes: [ + { dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024 }, + { dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 } + ] } }); break; @@ -183,19 +181,15 @@ $(function() { defaultChartGrid = { 'c0': { title: PMA_messages['strQuestions'], series: [{label: PMA_messages['strQuestions']}], - nodes: {dataPoints: [{ type: 'statusvar', name: 'Questions' }], - display: ['differential'] - } + nodes: [{dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }] }, 'c1': { title: PMA_messages['strChartConnectionsTitle'], series: [ { label: PMA_messages['strConnections']}, { label: PMA_messages['strProcesses']} ], - nodes: {dataPoints: [{ type: 'statusvar', name: 'Connections' }, - { type: 'proc', name: 'processes' } - ], - display: ['differential', ''] - } + nodes: [ { dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' }, + { dataPoints: [{ type: 'proc', name: 'processes' }] } + ] }, 'c2': { title: PMA_messages['strTraffic'], @@ -203,12 +197,10 @@ $(function() { { label: PMA_messages['strBytesSent']}, { label: PMA_messages['strBytesReceived']} ], - nodes: {dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }, - { type: 'proc', name: 'Bytes_received' } - ], - valueDivisor: [1024, 1024], - display: ['differential', 'differential'] - } + nodes: [ + { dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024 }, + { dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024 } + ] } }; @@ -1238,7 +1230,7 @@ $(function() { return; } // Draw all series - for (var j = 0; j < elem.series.length; j++) { + for (var j = 0; j < elem.chart.series.length; j++) { // Update x-axis if (i == 0 && j == 0) { if (oldChartData == null) { @@ -1255,9 +1247,9 @@ $(function() { /* Calculate y value */ // If transform function given, use it - if (elem.nodes.transformFn[j]) { + if (elem.nodes[j].transformFn) { value = chartValueTransform( - elem.nodes.transformFn[j], + elem.nodes[j].transformFn, chartData[key][j], // Check if first iteration (oldChartData==null), or if newly added chart oldChartData[key]==null (oldChartData == null || oldChartData[key] == null ? null : oldChartData[key][j]) @@ -1268,15 +1260,15 @@ $(function() { } else { value = parseFloat(chartData[key][j][0].value); - if (elem.nodes.display[j] == 'differential') { + if (elem.nodes[j].display == 'differential') { if (oldChartData == null || oldChartData[key] == null) { continue; } value -= oldChartData[key][j][0].value; } - if (elem.nodes.valueDivisor[j]) { - value = value / elem.nodes.valueDivisor[j]; + if (elem.nodes[j].valueDivisor) { + value = value / elem.nodes[j].valueDivisor; } } @@ -1287,7 +1279,7 @@ $(function() { false, elem.numPoints >= runtime.gridMaxPoints );*/ - elem.chart.series[0].data.push([chartData.x, value]); + elem.chart.series[j].data.push([chartData.x, value]); } } @@ -1353,8 +1345,8 @@ $(function() { var chartID = 0; $.each(runtime.charts, function(key, chart) { runtime.dataList[chartID] = []; - for(var i=0; i < chart.series.length; i++) { - runtime.dataList[chartID][i] = chart.nodes.dataPoints[i]; + for(var i=0; i < chart.nodes.length; i++) { + runtime.dataList[chartID][i] = chart.nodes[i].dataPoints; } runtime.charts[key].chartID = chartID; chartID++; From 2f88914bbd7a93d0684a5b09534c2d85610010ac Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 30 Aug 2012 23:05:02 +0530 Subject: [PATCH 7/7] jqplot: fix settings to somewhat enable charts --- js/server_status_monitor.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index b4d012f425..f19e94b649 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1077,14 +1077,16 @@ $(function() { xaxis: { renderer: $.jqplot.DateAxisRenderer, tickOptions: { - formatString: '%H:%M:%S' + formatString: '%H:%M:%S', + showGridline: false }, min: runtime.xmin, - max: runtime.xmax, - tickInterval: '10 seconds' + max: runtime.xmax }, yaxis: { - min:0 + min:0, + max:500, + numberTicks:6 } }, seriesDefaults: { @@ -1110,7 +1112,7 @@ $(function() { $('table#chartGrid tr:last').append('
'); } - chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, [[0,0]], settings); + chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, [[,]], settings); chartObj.numPoints = 0; if (initialize != true) {