'
+ );
// Delay loading a bit so the tab loads and the user gets to see a ajax loading icon
setTimeout(function() {
- loadJavascript(['js/jquery/timepicker.js','js/jquery/jquery.json-2.2.js',
+ loadJavascript(['js/jquery/timepicker.js', 'js/jquery/jquery.json-2.2.js',
'js/jquery/jquery.sprintf.js', 'js/jquery/jquery.sortableTable.js',
'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js',
'js/server_status_monitor.js']);
- },50);
+ }, 50);
monitorLoaded = true;
}
@@ -124,7 +132,7 @@ $(function() {
// Initialize each tab
$('div.ui-tabs-panel').each(function() {
- initTab($(this),null);
+ initTab($(this), null);
tabStatus[$(this).attr('id')] = 'static';
});
@@ -133,12 +141,13 @@ $(function() {
// Handles refresh rate changing
$('.buttonlinks select').change(function() {
- var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
+ var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
// Clear current timeout and set timeout with the new refresh rate
clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]);
- if(chart.options.realtime.postRequest)
+ if (chart.options.realtime.postRequest) {
chart.options.realtime.postRequest.abort();
+ }
chart.options.realtime.refreshRate = 1000*parseInt(this.value);
@@ -157,18 +166,18 @@ $(function() {
// Ajax refresh of variables (always the first element in each tab)
$('.buttonlinks a.tabRefresh').click(function() {
// ui-tabs-panel class is added by the jquery tabs feature
- var tab=$(this).parents('div.ui-tabs-panel');
+ var tab = $(this).parents('div.ui-tabs-panel');
var that = this;
// Show ajax load icon
$(this).find('img').show();
- $.get($(this).attr('href'),{ajax_request:1},function(data) {
+ $.get($(this).attr('href'), { ajax_request: 1 }, function(data) {
$(that).find('img').hide();
- initTab(tab,data);
+ initTab(tab, data);
});
- tabStatus[tab.attr('id')]='data';
+ tabStatus[tab.attr('id')] = 'data';
return false;
});
@@ -179,20 +188,22 @@ $(function() {
// Live traffic charting
$('.buttonlinks a.livetrafficLink').click(function() {
// ui-tabs-panel class is added by the jquery tabs feature
- var $tab=$(this).parents('div.ui-tabs-panel');
+ var $tab = $(this).parents('div.ui-tabs-panel');
var tabstat = tabStatus[$tab.attr('id')];
- if(tabstat=='static' || tabstat=='liveconnections') {
+ if (tabstat == 'static' || tabstat == 'liveconnections') {
var settings = {
series: [
{ name: PMA_messages['strChartKBSent'], data: [] },
{ name: PMA_messages['strChartKBReceived'], data: [] }
],
title: { text: PMA_messages['strChartServerTraffic'] },
- realtime: { url:'server_status.php?' + url_query,
+ realtime: { url: 'server_status.php?' + url_query,
type: 'traffic',
callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
- if(lastVal==null) return;
+ if (lastVal == null) {
+ return;
+ }
chartObj.series[0].addPoint(
{ x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 },
false,
@@ -208,13 +219,14 @@ $(function() {
}
}
- setupLiveChart($tab,this,settings);
- if(tabstat == 'liveconnections')
+ setupLiveChart($tab, this, settings);
+ if (tabstat == 'liveconnections') {
$tab.find('.buttonlinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']);
- tabStatus[$tab.attr('id')]='livetraffic';
+ }
+ tabStatus[$tab.attr('id')] = 'livetraffic';
} else {
$(this).html(PMA_messages['strLiveTrafficChart']);
- setupLiveChart($tab,this,null);
+ setupLiveChart($tab, this, null);
}
return false;
@@ -222,20 +234,22 @@ $(function() {
// Live connection/process charting
$('.buttonlinks a.liveconnectionsLink').click(function() {
- var $tab=$(this).parents('div.ui-tabs-panel');
+ var $tab = $(this).parents('div.ui-tabs-panel');
var tabstat = tabStatus[$tab.attr('id')];
- if(tabstat == 'static' || tabstat == 'livetraffic') {
+ if (tabstat == 'static' || tabstat == 'livetraffic') {
var settings = {
series: [
{ name: PMA_messages['strChartConnections'], data: [] },
{ name: PMA_messages['strChartProcesses'], data: [] }
],
title: { text: PMA_messages['strChartConnectionsTitle'] },
- realtime: { url:'server_status.php?'+url_query,
+ realtime: { url: 'server_status.php?' + url_query,
type: 'proc',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal==null) return;
+ callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
+ if (lastVal == null) {
+ return;
+ }
chartObj.series[0].addPoint(
{ x: curVal.x, y: curVal.y_conn - lastVal.y_conn },
false,
@@ -251,13 +265,14 @@ $(function() {
}
};
- setupLiveChart($tab,this,settings);
- if(tabstat == 'livetraffic')
+ setupLiveChart($tab, this, settings);
+ if (tabstat == 'livetraffic') {
$tab.find('.buttonlinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']);
- tabStatus[$tab.attr('id')]='liveconnections';
+ }
+ tabStatus[$tab.attr('id')] = 'liveconnections';
} else {
$(this).html(PMA_messages['strLiveConnChart']);
- setupLiveChart($tab,this,null);
+ setupLiveChart($tab, this, null);
}
return false;
@@ -268,17 +283,20 @@ $(function() {
var $tab = $(this).parents('div.ui-tabs-panel');
var settings = null;
- if(tabStatus[$tab.attr('id')] == 'static') {
+ if (tabStatus[$tab.attr('id')] == 'static') {
settings = {
series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ],
title: { text: PMA_messages['strChartIssuedQueriesTitle'] },
- tooltip: { formatter:function() { return this.point.name; } },
- realtime: { url:'server_status.php?'+url_query,
+ tooltip: { formatter: function() { return this.point.name; } },
+ realtime: { url: 'server_status.php?' + url_query,
type: 'queries',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal == null) return;
- chartObj.series[0].addPoint(
- { x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) },
+ callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
+ if (lastVal == null) { return; }
+ chartObj.series[0].addPoint({
+ x: curVal.x,
+ y: curVal.y - lastVal.y,
+ name: sortedQueriesPointInfo(curVal, lastVal)
+ },
true,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
@@ -290,23 +308,23 @@ $(function() {
$(this).html(PMA_messages['strLiveQueryChart']);
}
- setupLiveChart($tab,this,settings);
+ setupLiveChart($tab, this, settings);
tabStatus[$tab.attr('id')] = 'livequeries';
return false;
});
- function setupLiveChart($tab,link,settings) {
- if(settings != null) {
+ function setupLiveChart($tab, link, settings) {
+ if (settings != null) {
// Loading a chart with existing chart => remove old chart first
- if(tabStatus[$tab.attr('id')] != 'static') {
+ if (tabStatus[$tab.attr('id')] != 'static') {
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null;
+ chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"] = null;
tabChart[$tab.attr('id')].destroy();
// Also reset the select list
$tab.find('.buttonlinks select').get(0).selectedIndex = 2;
}
- if(! settings.chart) settings.chart = {};
+ if (! settings.chart) settings.chart = {};
settings.chart.renderTo = $tab.attr('id') + "_chart_cnt";
$tab.find('.tabInnerContent')
@@ -318,13 +336,13 @@ $(function() {
$tab.find('.buttonlinks .refreshList').show();
} else {
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null;
+ chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"] = null;
$tab.find('.tabInnerContent').show();
- $tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove();
- tabStatus[$tab.attr('id')]='static';
+ $tab.find('div#' + $tab.attr('id') + '_chart_cnt').remove();
+ tabStatus[$tab.attr('id')] = 'static';
tabChart[$tab.attr('id')].destroy();
$tab.find('.buttonlinks a.tabRefresh').show();
- $tab.find('.buttonlinks select').get(0).selectedIndex=2;
+ $tab.find('.buttonlinks select').get(0).selectedIndex = 2;
$tab.find('.buttonlinks .refreshList').hide();
}
}
@@ -336,10 +354,12 @@ $(function() {
});
$('#filterText').keyup(function(e) {
- word = $(this).val().replace(/_/g,' ');
+ word = $(this).val().replace(/_/g, ' ');
- if(word.length == 0) textFilter = null;
- else textFilter = new RegExp("(^|_)" + word,'i');
+ if (word.length == 0) {
+ textFilter = null;
+ }
+ else textFilter = new RegExp("(^|_)" + word, 'i');
text = word;
@@ -360,22 +380,24 @@ $(function() {
});
/* Adjust DOM / Add handlers to the tabs */
- function initTab(tab,data) {
+ function initTab(tab, data) {
switch(tab.attr('id')) {
case 'statustabs_traffic':
- if(data != null) tab.find('.tabInnerContent').html(data);
+ if (data != null) {
+ tab.find('.tabInnerContent').html(data);
+ }
PMA_convertFootnotesToTooltips();
break;
case 'statustabs_queries':
- if(data != null) {
+ if (data != null) {
queryPieChart.destroy();
tab.find('.tabInnerContent').html(data);
}
// Build query statistics chart
var cdata = new Array();
- $.each(jQuery.parseJSON($('#serverstatusquerieschart span').html()),function(key,value) {
- cdata.push([key,parseInt(value)]);
+ $.each(jQuery.parseJSON($('#serverstatusquerieschart span').html()), function(key, value) {
+ cdata.push([key, parseInt(value)]);
});
queryPieChart = PMA_createChart({
@@ -383,11 +405,11 @@ $(function() {
renderTo: 'serverstatusquerieschart'
},
title: {
- text:'',
- margin:0
+ text: '',
+ margin: 0
},
series: [{
- type:'pie',
+ type: 'pie',
name: PMA_messages['strChartQueryPie'],
data: cdata
}],
@@ -398,21 +420,24 @@ $(function() {
dataLabels: {
enabled: true,
formatter: function() {
- return ''+ this.point.name +'').html(value.recommendation).text())
$tbody.append($tr = $('' +
value.issue + ' ' + rc_stripped + ' 
' + PMA_messages['strInvalidResponseExplanation'])
+ $('#emptyDialog').attr('title', PMA_messages['strRefreshFailed']);
+ $('#emptyDialog').html(
+ ' ' +
+ PMA_messages['strInvalidResponseExplanation']
+ );
$('#emptyDialog').dialog({ buttons: btns });
}
});
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index adb0023c66..02a6b0df51 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -2,6 +2,13 @@ $(function() {
// Show tab links
$('div#statustabs_charting div.tabLinks').show();
$('div#statustabs_charting img#loadingMonitorIcon').remove();
+ // Codemirror is loaded on demand so we might need to initialize it
+ if(! codemirror_editor) {
+ var elm = $('#sqlquery');
+ if (elm.length > 0 && typeof CodeMirror != 'undefined') {
+ codemirror_editor = CodeMirror.fromTextArea(elm[0], { lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql" });
+ }
+ }
/**** Monitor charting implementation ****/
/* Saves the previous ajax response for differential values */
@@ -80,7 +87,7 @@ $(function() {
{ dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strCachedMemory'], dataPoint: 'Cached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strBufferedMemory'], dataPoint: 'Buffers', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint:'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+ { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint: 'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
],
settings: {
chart: {
@@ -135,7 +142,7 @@ $(function() {
};
// Server is localhost => We can add cpu/memory/swap
- if(server_db_isLocal) {
+ if (server_db_isLocal) {
defaultChartGrid['c3'] = presetCharts['cpu-' + server_os];
defaultChartGrid['c4'] = presetCharts['memory-' + server_os];
defaultChartGrid['c5'] = presetCharts['swap-' + server_os];
@@ -174,14 +181,16 @@ $(function() {
$('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function() {
editMode = !editMode;
- if($(this).attr('href') == '#endChartEditMode') editMode = false;
+ if ($(this).attr('href') == '#endChartEditMode') {
+ editMode = false;
+ }
- // Icon graphics have zIndex 19,20 and 21. Let's just hope nothing else has the same zIndex
+ // Icon graphics have zIndex 19, 20 and 21. Let's just hope nothing else has the same zIndex
$('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
$('a[href="#endChartEditMode"]').toggle(editMode);
- if(editMode) {
+ if (editMode) {
// Close the settings popup
$('#statustabs_charting .popupContent').hide().removeClass('openedPopup');
@@ -199,20 +208,23 @@ $(function() {
var dragKey, dropKey, dropRender;
var dragRender = $(drag).children().first().attr('id');
- if($(drop).children().length > 0)
+ if ($(drop).children().length > 0) {
dropRender = $(drop).children().first().attr('id');
+ }
// Find the charts in the array
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == dragRender)
+ if (value.chart.options.chart.renderTo == dragRender) {
dragKey = key;
- if(dropRender && value.chart.options.chart.renderTo == dropRender)
+ }
+ if (dropRender && value.chart.options.chart.renderTo == dropRender) {
dropKey = key;
+ }
});
// Case 1: drag and drop are charts -> Switch keys
- if(dropKey) {
- if(dragKey) {
+ if (dropKey) {
+ if (dragKey) {
dragChart = runtime.charts[dragKey];
runtime.charts[dragKey] = runtime.charts[dropKey];
runtime.charts[dropKey] = dragChart;
@@ -226,15 +238,16 @@ $(function() {
var c = 0;
$.each(runtime.charts, function(key, value) {
- if(key != dropKey)
+ if (key != dropKey) {
keys.push(key);
+ }
});
keys.sort();
// Rebuilds all ids, with the dragged chart correctly inserted
- for(var i=0; i put at the end
- if(insertBefore != -1)
+ if (insertBefore != -1) {
newChartList['c' + (c++)] = runtime.charts[dropKey];
+ }
runtime.charts = newChartList;
}
@@ -269,31 +283,34 @@ $(function() {
var newSize = chartSize();
// Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',newSize.width + 'px');
+ $('table#chartGrid tr td').css('width', newSize.width + 'px');
/* Reorder all charts that it fills all column cells */
var numColumns;
var $tr = $('table#chartGrid tr:first');
- var row=0;
+ var row = 0;
while($tr.length != 0) {
numColumns = 1;
// To many cells in one row => put into next row
$tr.find('td').each(function() {
- if(numColumns > monitorSettings.columns) {
- if($tr.next().length == 0) $tr.after('
'); var dlgBtns = {}; @@ -428,7 +448,7 @@ $(function() { // Try loading config try { - var data = $('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html(); + var data = $('body', $('iframe#monitorConfigUpload')[0].contentWindow.document).html(); // Chrome wraps around '
' + PMA_messages['strIssuse'] + ':
' + rule.issue + '
' + PMA_messages['strRecommendation'] + ':
' + rule.recommendation + '
' + PMA_messages['strInvalidResponseExplanation'])
+ $('#emptyDialog').attr('title', PMA_messages['strRefreshFailed']);
+ $('#emptyDialog').html(
+ ' ' +
+ PMA_messages['strInvalidResponseExplanation']
+ );
$('#emptyDialog').dialog({ buttons: btns });
}
});
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index adb0023c66..02a6b0df51 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -2,6 +2,13 @@ $(function() {
// Show tab links
$('div#statustabs_charting div.tabLinks').show();
$('div#statustabs_charting img#loadingMonitorIcon').remove();
+ // Codemirror is loaded on demand so we might need to initialize it
+ if(! codemirror_editor) {
+ var elm = $('#sqlquery');
+ if (elm.length > 0 && typeof CodeMirror != 'undefined') {
+ codemirror_editor = CodeMirror.fromTextArea(elm[0], { lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql" });
+ }
+ }
/**** Monitor charting implementation ****/
/* Saves the previous ajax response for differential values */
@@ -80,7 +87,7 @@ $(function() {
{ dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strCachedMemory'], dataPoint: 'Cached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strBufferedMemory'], dataPoint: 'Buffers', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint:'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+ { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint: 'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
],
settings: {
chart: {
@@ -135,7 +142,7 @@ $(function() {
};
// Server is localhost => We can add cpu/memory/swap
- if(server_db_isLocal) {
+ if (server_db_isLocal) {
defaultChartGrid['c3'] = presetCharts['cpu-' + server_os];
defaultChartGrid['c4'] = presetCharts['memory-' + server_os];
defaultChartGrid['c5'] = presetCharts['swap-' + server_os];
@@ -174,14 +181,16 @@ $(function() {
$('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function() {
editMode = !editMode;
- if($(this).attr('href') == '#endChartEditMode') editMode = false;
+ if ($(this).attr('href') == '#endChartEditMode') {
+ editMode = false;
+ }
- // Icon graphics have zIndex 19,20 and 21. Let's just hope nothing else has the same zIndex
+ // Icon graphics have zIndex 19, 20 and 21. Let's just hope nothing else has the same zIndex
$('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
$('a[href="#endChartEditMode"]').toggle(editMode);
- if(editMode) {
+ if (editMode) {
// Close the settings popup
$('#statustabs_charting .popupContent').hide().removeClass('openedPopup');
@@ -199,20 +208,23 @@ $(function() {
var dragKey, dropKey, dropRender;
var dragRender = $(drag).children().first().attr('id');
- if($(drop).children().length > 0)
+ if ($(drop).children().length > 0) {
dropRender = $(drop).children().first().attr('id');
+ }
// Find the charts in the array
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == dragRender)
+ if (value.chart.options.chart.renderTo == dragRender) {
dragKey = key;
- if(dropRender && value.chart.options.chart.renderTo == dropRender)
+ }
+ if (dropRender && value.chart.options.chart.renderTo == dropRender) {
dropKey = key;
+ }
});
// Case 1: drag and drop are charts -> Switch keys
- if(dropKey) {
- if(dragKey) {
+ if (dropKey) {
+ if (dragKey) {
dragChart = runtime.charts[dragKey];
runtime.charts[dragKey] = runtime.charts[dropKey];
runtime.charts[dropKey] = dragChart;
@@ -226,15 +238,16 @@ $(function() {
var c = 0;
$.each(runtime.charts, function(key, value) {
- if(key != dropKey)
+ if (key != dropKey) {
keys.push(key);
+ }
});
keys.sort();
// Rebuilds all ids, with the dragged chart correctly inserted
- for(var i=0; i'); var dlgBtns = {}; @@ -428,7 +448,7 @@ $(function() { // Try loading config try { - var data = $('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html(); + var data = $('body', $('iframe#monitorConfigUpload')[0].contentWindow.document).html(); // Chrome wraps around '
' to any text content -.-
json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
} catch (err) {
@@ -438,7 +458,7 @@ $(function() {
}
// Basic check, is this a monitor config json?
- if(!json || ! json.monitorCharts || ! json.monitorCharts) {
+ if (!json || ! json.monitorCharts || ! json.monitorCharts) {
alert(PMA_messages['strFailedParsingConfig']);
$('div#emptyDialog').dialog('close');
return;
@@ -460,7 +480,7 @@ $(function() {
$('div#emptyDialog').dialog('close');
});
- $("body", d).append($form=$('div#emptyDialog').find('form'));
+ $("body", d).append($form = $('div#emptyDialog').find('form'));
$form.submit();
$('div#emptyDialog').append('
');
};
@@ -486,11 +506,11 @@ $(function() {
$('a[href="#pauseCharts"]').click(function() {
runtime.redrawCharts = ! runtime.redrawCharts;
- if(! runtime.redrawCharts)
+ if (! runtime.redrawCharts) {
$(this).html(' ' + PMA_messages['strResumeMonitor']);
- else {
+ } else {
$(this).html(' ' + PMA_messages['strPauseMonitor']);
- if(! runtime.charts) {
+ if (! runtime.charts) {
initGrid();
$('a[href="#settingsPopup"]').show();
}
@@ -508,25 +528,28 @@ $(function() {
var loadLogVars = function(getvars) {
vars = { ajax_request: true, logging_vars: true };
- if(getvars) $.extend(vars,getvars);
+ if (getvars) {
+ $.extend(vars, getvars);
+ }
$.get('server_status.php?' + url_query, vars,
function(data) {
var logVars = $.parseJSON(data),
icon = 'ic_s_success', msg='', str='';
- if(logVars['general_log'] == 'ON') {
- if(logVars['slow_query_log'] == 'ON')
+ if (logVars['general_log'] == 'ON') {
+ if (logVars['slow_query_log'] == 'ON') {
msg = PMA_messages['strBothLogOn'];
- else
+ } else {
msg = PMA_messages['strGenLogOn'];
+ }
}
- if(msg.length == 0 && logVars['slow_query_log'] == 'ON') {
+ if (msg.length == 0 && logVars['slow_query_log'] == 'ON') {
msg = PMA_messages['strSlowLogOn'];
}
- if(msg.length == 0) {
+ if (msg.length == 0) {
icon = 'ic_s_error';
msg = PMA_messages['strBothLogOff'];
}
@@ -534,65 +557,74 @@ $(function() {
str = '' + PMA_messages['strCurrentSettings'] + '
';
str += ' ' + msg + '
';
- if(logVars['log_output'] != 'TABLE')
+ if (logVars['log_output'] != 'TABLE') {
str += ' ' + PMA_messages['strLogOutNotTable'] + '
';
- else
+ } else {
str += ' ' + PMA_messages['strLogOutIsTable'] + '
';
+ }
- if(logVars['slow_query_log'] == 'ON') {
- if(logVars['long_query_time'] > 2)
+ if (logVars['slow_query_log'] == 'ON') {
+ if (logVars['long_query_time'] > 2) {
str += ' '
+ $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
+ '
';
-
- if(logVars['long_query_time'] < 2)
+ }
+
+ if (logVars['long_query_time'] < 2) {
str += ' '
+ $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
+ '
';
+ }
}
str += '';
- if(is_superuser) {
+ if (is_superuser) {
str += 'Change settings';
str += '';
str += PMA_messages['strSettingsAppliedGlobal'] + '
';
var varValue = 'TABLE';
- if(logVars['log_output'] == 'TABLE') varValue = 'FILE';
-
+ if (logVars['log_output'] == 'TABLE') {
+ varValue = 'FILE';
+ }
+
str += '- '
+ $.sprintf(PMA_messages['strSetLogOutput'], varValue)
+ '
';
- if(logVars['general_log'] != 'ON')
+ if (logVars['general_log'] != 'ON') {
str += '- '
+ $.sprintf(PMA_messages['strEnableVar'], 'general_log')
+ '
';
- else
+ } else {
str += '- '
+ $.sprintf(PMA_messages['strDisableVar'], 'general_log')
+ '
';
+ }
- if(logVars['slow_query_log'] != 'ON')
+ if (logVars['slow_query_log'] != 'ON') {
str += '- '
+ $.sprintf(PMA_messages['strEnableVar'], 'slow_query_log')
+ '
';
- else
+ } else {
str += '- '
+ $.sprintf(PMA_messages['strDisableVar'], 'slow_query_log')
+ '
';
-
+ }
varValue = 5;
- if(logVars['long_query_time'] > 2) varValue = 1;
+ if (logVars['long_query_time'] > 2) {
+ varValue = 1;
+ }
str += '- '
+ $.sprintf(PMA_messages['setSetLongQueryTime'], varValue)
+ '
';
- } else
+ } else {
str += PMA_messages['strNoSuperUser'] + '
';
+ }
str += '';
@@ -620,9 +652,12 @@ $(function() {
$('input[name="chartType"]').change(function() {
$('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
var title = $('input[name="chartTitle"]').attr('value');
- if(title == PMA_messages['strChartTitle'] || title == $('label[for="'+$('input[name="chartTitle"]').data('lastRadio')+'"]').text()) {
- $('input[name="chartTitle"]').data('lastRadio',$(this).attr('id'));
- $('input[name="chartTitle"]').attr('value',$('label[for="'+$(this).attr('id')+'"]').text());
+ if (title == PMA_messages['strChartTitle']
+ || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text()
+ ) {
+ $('input[name="chartTitle"]')
+ .data('lastRadio', $(this).attr('id'))
+ .attr('value', $('label[for="' + $(this).attr('id') + '"]').text());
}
});
@@ -635,23 +670,24 @@ $(function() {
});
$('select[name="varChartList"]').change(function () {
- if(this.selectedIndex!=0)
- $('#variableInput').attr('value',this.value);
+ if (this.selectedIndex != 0) {
+ $('#variableInput').attr('value', this.value);
+ }
});
$('a[href="#kibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strKiB']);
+ $('input[name="valueDivisor"]').attr('value', 1024);
+ $('input[name="valueUnit"]').attr('value', PMA_messages['strKiB']);
$('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
+ $('input[name="useUnit"]').prop('checked', true);
return false;
});
$('a[href="#mibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024*1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strMiB']);
+ $('input[name="valueDivisor"]').attr('value', 1024*1024);
+ $('input[name="valueUnit"]').attr('value', PMA_messages['strMiB']);
$('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
+ $('input[name="useUnit"]').prop('checked', true);
return false;
});
@@ -662,33 +698,37 @@ $(function() {
});
$('a[href="#submitAddSeries"]').click(function() {
- if($('input#variableInput').attr('value').length == 0) return false;
-
- if(newChart == null) {
+ if ($('input#variableInput').attr('value').length == 0) {
+ return false;
+ }
+
+ if (newChart == null) {
$('#seriesPreview').html('');
newChart = {
title: $('input[name="chartTitle"]').attr('value'),
nodes: []
- }
+ };
}
var serie = {
- dataType:'statusvar',
+ dataType: 'statusvar',
dataPoint: $('input#variableInput').attr('value'),
name: $('input#variableInput').attr('value'),
display: $('input[name="differentialValue"]').attr('checked') ? 'differential' : ''
};
- if(serie.dataPoint == 'Processes') serie.dataType='proc';
+ if (serie.dataPoint == 'Processes') {
+ serie.dataType='proc';
+ }
- if($('input[name="useDivisor"]').attr('checked'))
+ if ($('input[name="useDivisor"]').attr('checked')) {
serie.valueDivisor = parseInt($('input[name="valueDivisor"]').attr('value'));
+ }
- if($('input[name="useUnit"]').attr('checked'))
+ if ($('input[name="useUnit"]').attr('checked')) {
serie.unit = $('input[name="valueUnit"]').attr('value');
-
-
+ }
var str = serie.display == 'differential' ? ', ' + PMA_messages['strDifferential'] : '';
str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
@@ -697,13 +737,13 @@ $(function() {
newChart.nodes.push(serie);
- $('input#variableInput').attr('value','');
- $('input[name="differentialValue"]').attr('checked',true);
- $('input[name="useDivisor"]').attr('checked',false);
- $('input[name="useUnit"]').attr('checked',false);
+ $('input#variableInput').attr('value', '');
+ $('input[name="differentialValue"]').attr('checked', true);
+ $('input[name="useDivisor"]').attr('checked', false);
+ $('input[name="useUnit"]').attr('checked', false);
$('input[name="useDivisor"]').trigger('change');
$('input[name="useUnit"]').trigger('change');
- $('select[name="varChartList"]').get(0).selectedIndex=0;
+ $('select[name="varChartList"]').get(0).selectedIndex = 0;
$('span#clearSeriesLink').show();
@@ -714,33 +754,38 @@ $(function() {
source: variableNames
});
-
+ /* Initializes the monitor, called only once */
function initGrid() {
var settings;
var series;
/* Apply default values & config */
- if(window.localStorage) {
- if(window.localStorage['monitorCharts'])
+ if (window.localStorage) {
+ if (window.localStorage['monitorCharts']) {
runtime.charts = $.parseJSON(window.localStorage['monitorCharts']);
- if(window.localStorage['monitorSettings'])
+ }
+ if (window.localStorage['monitorSettings']) {
monitorSettings = $.parseJSON(window.localStorage['monitorSettings']);
+ }
$('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
}
- if(runtime.charts == null)
+ if (runtime.charts == null) {
runtime.charts = defaultChartGrid;
- if(monitorSettings == null)
+ }
+ if (monitorSettings == null) {
monitorSettings = defaultMonitorSettings;
+ }
- $('select[name="gridChartRefresh"]').attr('value',monitorSettings.gridRefresh / 1000);
- $('select[name="chartColumns"]').attr('value',monitorSettings.columns);
+ $('select[name="gridChartRefresh"]').attr('value', monitorSettings.gridRefresh / 1000);
+ $('select[name="chartColumns"]').attr('value', monitorSettings.columns);
- if(monitorSettings.gridMaxPoints == 'auto')
+ if (monitorSettings.gridMaxPoints == 'auto') {
runtime.gridMaxPoints = Math.round((monitorSettings.chartSize.width - 40) / 12);
- else
+ } else {
runtime.gridMaxPoints = monitorSettings.gridMaxPoints;
+ }
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
@@ -748,8 +793,10 @@ $(function() {
/* Calculate how much spacing there is between each chart */
$('table#chartGrid').html('');
}
// Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',chartSize().width + 'px');
+ $('table#chartGrid tr td').css('width', chartSize().width + 'px');
buildRequiredDataList();
refreshChartGrid();
}
+ /* Destroys all monitor related resources */
function destroyGrid() {
- if(runtime.charts)
+ if (runtime.charts) {
$.each(runtime.charts, function(key, value) {
try {
value.chart.destroy();
} catch(err) {}
});
+ }
+
try {
runtime.refreshRequest.abort();
} catch(err) {}
@@ -797,14 +847,16 @@ $(function() {
monitorSettings = null;
}
+ /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart
+ * data from each chart and restores it after the monitor is initialized again */
function rebuildGrid() {
var oldData = null;
- if(runtime.charts) {
+ if (runtime.charts) {
oldData = {};
$.each(runtime.charts, function(key, chartObj) {
- for(var i=0; i < chartObj.nodes.length; i++) {
+ for (var i = 0; i < chartObj.nodes.length; i++) {
oldData[chartObj.nodes[i].dataPoint] = [];
- for(var j=0; j < chartObj.chart.series[i].data.length; j++)
+ for (var j = 0; j < chartObj.chart.series[i].data.length; j++)
oldData[chartObj.nodes[i].dataPoint].push([chartObj.chart.series[i].data[j].x, chartObj.chart.series[i].data[j].y]);
}
});
@@ -813,16 +865,18 @@ $(function() {
destroyGrid();
initGrid();
- if(oldData) {
+ if (oldData) {
$.each(runtime.charts, function(key, chartObj) {
- for(var j=0; j < chartObj.nodes.length; j++) {
- if(oldData[chartObj.nodes[j].dataPoint])
+ for (var j = 0; j < chartObj.nodes.length; j++) {
+ if (oldData[chartObj.nodes[j].dataPoint]) {
chartObj.chart.series[j].setData(oldData[chartObj.nodes[j].dataPoint]);
+ }
}
});
}
}
+ /* Calculactes the dynamic chart size that depends on the column width */
function chartSize() {
var wdt = $('div#logTable').innerWidth() / monitorSettings.columns - (monitorSettings.columns - 1) * chartSpacing.width;
return {
@@ -831,9 +885,10 @@ $(function() {
}
}
+ /* Adds a chart to the chart grid */
function addChart(chartObj, initialize) {
series = [];
- for(var j=0; j';
+ var s = '' + Highcharts.dateFormat('%H:%M:%S', this.x) + '';
$.each(this.points, function(i, point) {
- s += '
'+ point.series.name +': '+
+ s += '
' + point.series.name + ': ' +
((parseInt(point.y) == point.y) ? point.y : Highcharts.numberFormat(this.y, 2)) + ' ' + (point.series.options.unit || '');
});
@@ -933,52 +981,59 @@ $(function() {
title: { text: chartObj.title }
};
- if(chartObj.settings)
- $.extend(true,settings,chartObj.settings);
+ if (chartObj.settings) {
+ $.extend(true, settings, chartObj.settings);
+ }
- if($('#'+settings.chart.renderTo).length==0) {
+ if ($('#' + settings.chart.renderTo).length == 0) {
var numCharts = $('table#chartGrid .monitorChart').length;
- if(numCharts == 0 || !( numCharts % monitorSettings.columns))
+ if (numCharts == 0 || !( numCharts % monitorSettings.columns)) {
$('table#chartGrid').append('Chart title:
';
htmlStr += '
Series:
';
- for(var i=0; i
';
+ for (var i = 0; i
';
}
dlgBtns = {};
@@ -999,8 +1054,8 @@ $(function() {
$(this).dialog('close');
};
- $('div#emptyDialog').attr('title','Edit chart');
- $('div#emptyDialog').html(htmlStr+'
');
+ $('div#emptyDialog').attr('title', 'Edit chart');
+ $('div#emptyDialog').html(htmlStr + '');
$('div#emptyDialog').dialog({
width: 'auto',
height: 'auto',
@@ -1008,12 +1063,15 @@ $(function() {
});
}
+ /* Removes a chart from the grid */
function removeChart(chartObj) {
var htmlnode = chartObj.options.chart.renderTo;
- if(! htmlnode ) return;
+ if (! htmlnode ) {
+ return;
+ }
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == htmlnode) {
+ if (value.chart.options.chart.renderTo == htmlnode) {
delete runtime.charts[key];
return false;
}
@@ -1026,51 +1084,67 @@ $(function() {
setTimeout(function() {
chartObj.destroy();
$('div#' + htmlnode).remove();
- },10);
+ }, 10);
saveMonitor(); // Save settings
}
+ /* Called in regular intervalls, this function updates the values of each chart in the grid */
function refreshChartGrid() {
/* Send to server */
- runtime.refreshRequest = $.post('server_status.php?'+url_query, { ajax_request: true, chart_data: 1, type: 'chartgrid', requiredData: $.toJSON(runtime.dataList) },function(data) {
+ runtime.refreshRequest = $.post('server_status.php?' + url_query, {
+ ajax_request: true,
+ chart_data: 1,
+ type: 'chartgrid',
+ requiredData: $.toJSON(runtime.dataList)
+ }, function(data) {
var chartData;
try {
chartData = $.parseJSON(data);
} catch(err) {
return serverResponseError();
}
- var value, i=0;
+ var value, i = 0;
var diff;
/* Update values in each graph */
$.each(runtime.charts, function(orderKey, elem) {
var key = elem.chartID;
// If newly added chart, we have no data for it yet
- if(! chartData[key]) return;
+ if (! chartData[key]) {
+ return;
+ }
// Draw all points
- for(var j=0; j < elem.nodes.length; j++) {
+ for (var j = 0; j < elem.nodes.length; j++) {
value = chartData[key][j].y;
+
+ // Update x-axis
+ if (i == 0 && j == 0) {
+ if (oldChartData == null) {
+ diff = chartData.x - runtime.xmax;
+ } else {
+ diff = parseInt(chartData.x - oldChartData.x);
+ }
- if(i==0 && j==0) {
- if(oldChartData==null) diff = chartData.x - runtime.xmax;
- else diff = parseInt(chartData.x - oldChartData.x);
-
- runtime.xmin+= diff;
- runtime.xmax+= diff;
+ runtime.xmin += diff;
+ runtime.xmax += diff;
}
elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
- if(elem.nodes[j].display == 'differential') {
- if(oldChartData == null || oldChartData[key] == null) continue;
+ // Calculate y value
+ if (elem.nodes[j].display == 'differential') {
+ if (oldChartData == null || oldChartData[key] == null) {
+ continue;
+ }
value -= oldChartData[key][j].y;
}
- if(elem.nodes[j].valueDivisor)
+ if (elem.nodes[j].valueDivisor) {
value = value / elem.nodes[j].valueDivisor;
+ }
- if(elem.nodes[j].transformFn) {
+ if (elem.nodes[j].transformFn) {
value = chartValueTransform(
elem.nodes[j].transformFn,
chartData[key][j],
@@ -1078,19 +1152,22 @@ $(function() {
);
}
- if(value != undefined)
+ // Set y value, if defined
+ if (value != undefined) {
elem.chart.series[j].addPoint(
- { x: chartData.x, y: value },
+ { x: chartData.x, y: value },
false,
elem.numPoints >= runtime.gridMaxPoints
);
+ }
}
i++;
runtime.charts[orderKey].numPoints++;
- if(runtime.redrawCharts)
+ if (runtime.redrawCharts) {
elem.chart.redraw();
+ }
});
oldChartData = chartData;
@@ -1099,10 +1176,14 @@ $(function() {
});
}
- function chartValueTransform(name,cur,prev) {
+ /* Function that supplies special value transform functions for chart values */
+ function chartValueTransform(name, cur, prev) {
switch(name) {
case 'cpu-linux':
- if(prev == null) return undefined;
+ if (prev == null) {
+ return undefined;
+ }
+
var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
var diff_idle = cur.idle - prev.idle;
return 100*(diff_total - diff_idle) / diff_total;
@@ -1110,10 +1191,11 @@ $(function() {
return undefined;
}
- /* Build list of nodes that need to be retrieved */
+ /* Build list of nodes that need to be retrieved from server */
function buildRequiredDataList() {
runtime.dataList = {};
- // Store an own id, because the property name is subject of reordering, thus destroying our mapping with runtime.charts <=> runtime.dataList
+ // Store an own id, because the property name is subject of reordering,
+ // thus destroying our mapping with runtime.charts <=> runtime.dataList
var chartID = 0;
$.each(runtime.charts, function(key, chart) {
runtime.dataList[chartID] = chart.nodes;
@@ -1122,24 +1204,30 @@ $(function() {
});
}
+ /* Loads the log table data, generates the table and handles the filters */
function loadLogStatistics(opts) {
var tableStr = '';
var logRequest = null;
- if(! opts.removeVariables)
+ if (! opts.removeVariables) {
opts.removeVariables = false;
- if(! opts.limitTypes)
+ }
+ if (! opts.limitTypes) {
opts.limitTypes = false;
+ }
- $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + ' ');
+ $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
+ ' 
');
$('#emptyDialog').dialog({
width: 'auto',
height: 'auto',
buttons: {
'Cancel request': function() {
- if(logRequest != null)
+ if (logRequest != null) {
logRequest.abort();
+ }
$(this).dialog("close");
}
@@ -1147,7 +1235,7 @@ $(function() {
});
- logRequest = $.get('server_status.php?'+url_query,
+ logRequest = $.get('server_status.php?' + url_query,
{ ajax_request: true,
log_data: 1,
type: opts.src,
@@ -1164,7 +1252,7 @@ $(function() {
return serverResponseError();
}
- if(logData.rows.length != 0) {
+ if (logData.rows.length != 0) {
runtime.logDataCols = buildLogTable(logData);
/* Show some stats in the dialog */
@@ -1172,12 +1260,14 @@ $(function() {
$('#emptyDialog').html('' + PMA_messages['strLogDataLoaded'] + '
');
$.each(logData.sum, function(key, value) {
key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
- if(key == 'Total') key = '' + key + '';
+ if (key == 'Total') {
+ key = '' + key + '';
+ }
$('#emptyDialog').append(key + ': ' + value + '
');
});
/* Add filter options if more than a bunch of rows there to filter */
- if(logData.numRows > 12) {
+ if (logData.numRows > 12) {
$('div#logTable').prepend(
'