");
- $('#nodeDetail').hide();
-
- //check the software work status by platform(linux and aix)
- $.ajax( {
- url : 'lib/systemcmd.php',
- dataType : 'json',
- data : {
- cmd : 'ostype'
- },
+function loadRmcMon() {
+ // find the rmcmon tab
+ var rmcMonTab = $('#rmcmon');
- success : rsctRpmCheck
- });
+ // add the stauts bar first. id = 'rmcMonStatus'
+ var rmcStatusBar = createStatusBar('rmcMonStatus');
+ rmcStatusBar.find('div').append(createLoader());
+ rmcMonTab.append(rmcStatusBar);
+
+ // add the configure button.
+ var configButton = createButton('Configure');
+ configButton.hide();
+ configButton.click(function() {
+ if ($('#rmcMonConfig').is(':hidden')) {
+ $('#rmcMonConfig').show();
+ }
+ else {
+ $('#rmcMonConfig').hide();
+ }
+ });
+ rmcMonTab.append(configButton);
+
+ // add configure div
+ rmcMonTab.append("");
+ $('#rmcMonConfig').hide();
+
+ // load the configure div's content
+ loadRmcMonConfigure();
+
+ // add the content of the rmcmon, id = 'rmcMonTab'
+ rmcMonTab.append("
");
+ $('#nodeDetail').hide();
+
+ // check the software work status by platform(linux and aix)
+ $.ajax( {
+ url : 'lib/systemcmd.php',
+ dataType : 'json',
+ data : {
+ cmd : 'ostype'
+ },
+
+ success : rsctRpmCheck
+ });
}
function loadRmcMonConfigure(){
- //get the configure div and clean its content.
+ // get the configure div and clean its content.
var rmcmonCfgDiv = $('#rmcMonConfig');
rmcmonCfgDiv.empty();
- //add the start button
+ // add the start button
var startButton = createButton('Start');
rmcmonCfgDiv.append(startButton);
startButton.click(function(){
@@ -68,7 +66,7 @@ function loadRmcMonConfigure(){
data : {
cmd : 'webrun',
tgt : '',
- args : 'rmcstart;lpar',
+ args : 'rmcstart;compute',
msg : ''
},
@@ -78,7 +76,7 @@ function loadRmcMonConfigure(){
});
});
- //add the stop button
+ // add the stop button
var stopButton = createButton('Stop');
rmcmonCfgDiv.append(stopButton);
stopButton.click(function(){
@@ -99,12 +97,6 @@ function loadRmcMonConfigure(){
});
});
- //add the attributes button
- var attrButton = createButton('Attribute Select');
- rmcmonCfgDiv.append(attrButton);
- attrButton.bind('click',function(){
- showConfigureDia();
- });
//add the cancel button
var cancelButton = createButton('Cancel');
rmcmonCfgDiv.append(cancelButton);
@@ -114,7 +106,7 @@ function loadRmcMonConfigure(){
}
function rsctRpmCheck(data){
- //linux had to check the rscp first
+ // linux had to check the rscp first
if ('aix' != data.rsp){
$.ajax( {
url : 'lib/systemcmd.php',
@@ -152,21 +144,21 @@ function xcatrmcRpmCheck(){
var softInstallStatus = data.rsp.split(/\n/);
var needHelp = false;
$('#rmcMonStatus div').empty();
- //check the xcat-rmc
+ // check the xcat-rmc
if (-1 != softInstallStatus[0].indexOf("not")){
needHelp = true;
$('#rmcMonStatus div').append(
'Please install the xCAT-rmc first. ');
}
- //check the rrdtool
+ // check the rrdtool
if (-1 != softInstallStatus[1].indexOf("not")){
needHelp = true;
$('#rmcMonStatus div').append(
'Please install the RRD-tool first. ');
}
- //add help info or load the rmc show
+ // add help info or load the rmc show
if (needHelp){
$('#rmcMonStatus div').append(
'You can find more support form xCAT2-Monitoring.pdf');
@@ -202,26 +194,25 @@ function rmcWorkingCheck(){
});
}
+function removeStatusBar(){
+ if (globalAllNodesNum == globalFinishNodesNum){
+ $('#rmcMonStatus').remove();
+ }
+
+ $('#rmcmonDetail [title]').tooltip({position:['center','right']});
+}
function loadRmcMonShow(){
- $('#rmcMonStatus div').empty().append("Getting monitoring Data (This step may take a long time).");
+ $('#rmcMonStatus div').empty().append("Getting Summary Data.");
$('#rmcMonStatus div').append(createLoader());
- //init the selected Attributes string
- if ($.cookie('rmcmonattr')){
- globalSelectedAttributes = $.cookie('rmcmonattr');
- }
- else{
- globalSelectedAttributes = 'PctTotalTimeIdle,PctTotalTimeWait,PctTotalTimeUser,PctTotalTimeKernel,PctRealMemFree';
- }
-
- //load the rmc status summary
+ // load the rmc status summary
$.ajax({
url : 'lib/cmd.php',
dataType : 'json',
data : {
cmd : 'webrun',
tgt : '',
- args : 'rmcshow;summary;' + globalSelectedAttributes,
+ args : 'rmcshow;summary;PctTotalTimeIdle,PctRealMemFree',
msg : ''
},
@@ -231,413 +222,284 @@ function loadRmcMonShow(){
});
}
-function showRmcSummary(returnData){
- var attributes = returnData.split(';');
- var attr;
- var attrName;
- var attrValues;
- var attrDiv;
- var summaryTable = $('
');
- var summaryRow;
- globalTimeStamp = new Array();
- //load each nodes' status
- $.ajax({
- url : 'lib/cmd.php',
- dataType : 'json',
- data : {
- cmd : 'webrun',
- tgt : '',
- args : 'rmcshow;lpar;' + globalSelectedAttributes,
- msg : ''
- },
-
- success : function(data){
- parseRmcData(data.rsp);
- }
- });
-
- //create the timestamp, the flot only use the UTC time, so had to change the value, to show the right time
- var tempDate = new Date();
- var tempOffset = tempDate.getTimezoneOffset();
- var tempTime = tempDate.getTime() - 3600000 - tempOffset * 60000;
-
- for (var i = 0; i < 60; i++){
- globalTimeStamp.push(tempTime + i * 60000);
- }
-
- //show the summary data
- $('#rmcmonSummary').empty().append('
Overview
');
- $('#rmcmonSummary').append(summaryTable);
-
- for ( attr in attributes){
- var tempTd = $('
');
- var tempArray = [];
- var temp = attributes[attr].indexOf(':');
- attrName = attributes[attr].substr(0, temp);
- attrValues = attributes[attr].substr(temp + 1).split(',');
- for (var i in attrValues){
- tempArray.push([globalTimeStamp[i], attrValues[i]]);
- }
+function showRmcSummary(returnData) {
+ var attributes = returnData.split(';');
+ var attr;
+ var attrName;
+ var attrValues;
+ var attrDiv;
+ var summaryTable = $('
');
+ var summaryRow;
+ globalTimeStamp = new Array();
- if (0 == (attr % 3)){
- summaryRow = $('
');
-
- }
+ //update the rmc status area
+ $('#rmcMonStatus div').empty().append("Getting Nodes' Data").append(createLoader());
+ // load each nodes' status
+ $.ajax( {
+ url : 'lib/cmd.php',
+ dataType : 'json',
+ data : {
+ cmd : 'webrun',
+ tgt : '',
+ args : 'rmcshow;compute;PctTotalTimeIdle,PctRealMemFree',
+ msg : ''
+ },
+
+ success : function(data) {
+ parseRmcData(data.rsp);
+ }
+ });
+
+ // create the timestamp, the flot only use the UTC time, so had to change
+ // the value, to show the right time
+ var tempDate = new Date();
+ var tempOffset = tempDate.getTimezoneOffset();
+ var tempTime = tempDate.getTime() - 3600000;
+ for ( var i = 0; i < 60; i++) {
+ tempDate.setTime(tempTime + i * 60000);
+ globalTimeStamp.push(tempDate.getTime());
+ }
+
+ // show the summary data
+ $('#rmcmonSummary').empty().append('
Overview
');
+ $('#rmcmonSummary').append(summaryTable);
+
+ for (attr in attributes) {
+ var tempTd = $('
');
- $('#rmcmonDetail').append(detailFilter);
-
- select = $('');
- for (var node in globalNodesDetail){
- for (var attr in globalNodesDetail[node]){
- select.append('');
- }
- break;
- }
-
- detailFilter.append('Metric: ');
- detailFilter.append(select);
- detailFilter.append(' ');
-
- //sort type
- select = $('');
- select.append('');
- select.append('');
- select.append('');
-
- detailFilter.append('Sort: ');
- detailFilter.append(select);
- detailFilter.append(' ');
-
- var filterButton = createButton('Filter');
- detailFilter.append(filterButton);
- filterButton.bind('click', function(){
- var attr = $('#metric').val();
- var type = $('#sortType').val();
- showAllNodes(attr, type);
- });
-
- filterButton.trigger('click');
+function createUnkownNode(nodeName){
+ var tempLi = '';
+ return tempLi;
}
-function showAllNodes(attrName, type){
- $('#rmcmonDetail table').remove();
- var detailTable = $('
');
- //remember how many nodes parsed, used for adding new table row
- var parseNum = 0;
- var detailRow;
- var sortArray = new Array();
-
- $('#rmcmonDetail').append(detailTable);
-
- for (var nodeName in globalErrNodes){
- var tempTd = $('
');
- }
-
- filterSort(attrName, type, sortArray);
- for (var sortIndex in sortArray){
- var tempTd = $('
');
- if (0 == (parseNum % 4)){
- detailRow = $('
');
- detailTable.append(detailRow);
- }
- detailRow.append(tempTd);
- parseNum ++;
- nodeChat = $('');
- tempTd.append(nodeChat);
-
-
- var tempData = sortArray[sortIndex]['value'].split(',');
- var tempArray = [];
- for (var i in tempData){
- tempArray.push([globalTimeStamp[i], tempData[i]]);
- }
- $.plot(nodeChat, [tempArray], {xaxis: {mode:"time", tickSize: [20, "minute"]}});
-
- tempTd.append('
' + sortArray[sortIndex]['name'] + '
');
- tempTd.css('cursor', 'pointer');
- tempTd.bind('click', function(){
- showNode($('center', $(this)).html());
- });
- }
+function createErrorNode(nodeName){
+ var tempLi = '';
}
-function showNode(nodeName){
- var nodeTable = $('
');
- var backButton = createButton('Go back to all nodes');
- var nodeRow;
- var parseNum = 0;
-
- $('#rmcmonDetail').hide();
- $('#nodeDetail').empty().show();
- $('#nodeDetail').append('
');
+ var attrChat = $('');
+ if (0 == parseNum % 4) {
+ nodeRow = $('
');
+ nodeTable.append(nodeRow);
+ }
+ nodeRow.append(tempTd);
+ parseNum++;
-function showConfigureDia(){
- var diaDiv = $('');
- var tempArray = globalSelectedAttributes.split(',');
- var selectedAttrHash = new Object();
- var wholeAttrArray = new Array('PctTotalTimeIdle','PctTotalTimeWait','PctTotalTimeUser','PctTotalTimeKernel','PctRealMemFree');
-
- //init the selectedAttrHash
- for (var i in tempArray){
- selectedAttrHash[tempArray[i]] = 1;
- }
- var attrTable = $('
');
- for (var i in wholeAttrArray){
- var name = wholeAttrArray[i];
- var tempString = '
';
- if (selectedAttrHash[name]){
- tempString += '
';
- }
- else{
- tempString += '
';
- }
-
- tempString += '
' + name + '
';
- attrTable.append(tempString);
- }
-
- var selectAllButton = createButton('Select All');
- selectAllButton.bind('click', function(){
- $('#rmcAttrTable input[type=checkbox]').attr('checked', true);
- });
- diaDiv.append(selectAllButton);
-
- var unselectAllButton = createButton('Unselect All');
- unselectAllButton.bind('click', function(){
- $('#rmcAttrTable input[type=checkbox]').attr('checked', false);
- });
- diaDiv.append(unselectAllButton);
-
- diaDiv.append(attrTable);
-
- diaDiv.dialog({
- modal: true,
- width: 400,
- close: function(event, ui){
- $(this).remove();
- },
- buttons: {
- cancel : function(){
- $(this).dialog('close');
- },
- ok : function(){
- //collect all attibutes' name
- var str = '';
- $('#rmcAttrTable input:checked').each(function(){
- if ('' == str){
- str += $(this).attr('name');
- }
- else{
- str += ',' + $(this).attr('name');
- }
- });
-
- //if no attribute is selected, alert the information.
- if ('' == str){
- alert('Please select one attribute at lease!');
- return;
- }
-
- //new selected attributes is different from the old, update the cookie and reload this tab
- if ($.cookie('rmcmonattr') != str){
- $.cookie('rmcmonattr', str, {path : '/xcat', expires : 10});
- //todo reload the tab
- $('#rmcmon').empty();
- loadRmcMon();
- }
- $(this).dialog('close');
- }
- }
- });
+ // data
+ tempTd.append(attrChat);
+ var tempData = globalNodesDetail[nodeName][attr].split(',');
+ var tempArray = [];
+ for ( var i in tempData) {
+ tempArray.push( [ globalTimeStamp[i], Number(tempData[i]) ]);
+ }
+
+ $.jqplot('monitornodediv' + nodeName + attr, [ tempArray ], {
+ series : [ {
+ showMarker : false
+ } ],
+ axes : {
+ xaxis : {
+ label : attr,
+ renderer : $.jqplot.DateAxisRenderer,
+ numberTicks : 5,
+ tickOptions : {
+ formatString : '%R',
+ show : true,
+ fontSize : '10px'
+ }
+ },
+ yaxis : {
+ tickOptions : {
+ formatString : '%.2f',
+ fontSize : '10px'
+ }
+ }
+ }
+ });
+ }
}
/*===========RMC Event Tab============*/
/**
* load the rmc event tab.
*
- * @param
+ * @param
*
* @return
- *
+ *
*/
function loadRmcEvent(){
- //find the rmcevent tab
+ // find the rmcevent tab
- //add the stauts bar first. id = 'rmcMonStatus'
+ // add the stauts bar first. id = 'rmcMonStatus'
var rmcStatusBar = createStatusBar('rmcEventStatus');
rmcStatusBar.find('div').append(createLoader());
$('#rmcevent').append(rmcStatusBar);
@@ -658,10 +520,10 @@ function loadRmcEvent(){
}
/**
- * get all conditions
+ * get all conditions
*
* @return
- *
+ *
*/
function getConditions(){
if ('' == globalCondition){
@@ -689,14 +551,14 @@ function getConditions(){
}
/**
- * get all response
+ * get all response
*
* @return
- *
+ *
*/
function getResponse(){
var tempFlag = false;
- //get all response first
+ // get all response first
for (var i in globalResponse){
tempFlag = true;
break;
@@ -726,16 +588,16 @@ function getResponse(){
}
/**
- * show all the event in the rmc event tab
+ * show all the event in the rmc event tab
*
* @param data response from the xcat server.
* @return
- *
+ *
*/
function showEventLog(data){
$('#rmcEventStatus div').empty();
- //rsct not installed.
+ // rsct not installed.
if (data.rsp[0] && (-1 != data.rsp[0].indexOf('lsevent'))){
$('#rmcEventStatus div').append('Please install RSCT first!');
return;
@@ -743,10 +605,10 @@ function showEventLog(data){
var eventDiv = $('#rmcEventDiv');
eventDiv.empty();
- //add the configure button
+ // add the configure button
loadRmcEventConfig();
- //get conditions and responses, save in the global
+ // get conditions and responses, save in the global
getConditions();
getResponse();
@@ -767,7 +629,7 @@ function showEventLog(data){
'iDisplayLength' :10
});
- //unsort on the content column
+ // unsort on the content column
$('#lsEventTable thead tr th').eq(2).unbind('click');
}
@@ -777,7 +639,7 @@ function showEventLog(data){
* @param
* @return
- *
+ *
*/
function loadRmcEventConfig(){
var buttons = $('');
@@ -808,13 +670,13 @@ function loadRmcEventConfig(){
* @param
* @return
- *
+ *
*/
function mkCondRespDia(){
var diaDiv = $('');
var mkAssociationTable = '
Condition Name
Response Name
';
mkAssociationTable += '
';
- //add the conditions into fieldset
+ // add the conditions into fieldset
if ('' == globalCondition){
mkAssociationTable += 'Getting predefined conditions, open this dislogue later.';
}
@@ -825,7 +687,7 @@ function mkCondRespDia(){
mkAssociationTable += '
');
- //change the response field when click the condition
+ // change the response field when click the condition
diaDiv.find('input:radio').bind('click', function(){
diaDiv.find('#mkAssResp').empty().append('Getting response').append(createLoader());
$.ajax({
@@ -883,7 +745,7 @@ function mkCondRespDia(){
var oldResp = new Object();
var oldString = '';
var newString = '';
- //get the old seelected responses
+ // get the old seelected responses
var conditionName = $(this).find('#mkAssCond :checked').attr('value');
if (!conditionName){
return;
@@ -896,7 +758,7 @@ function mkCondRespDia(){
for (var i in tempArray){
oldResp[tempArray[i]] = 1;
}
- //get the new selected responses
+ // get the new selected responses
$(this).find('#mkAssResp input:checked').each(function(){
var respName = $(this).attr('value');
newResp[respName] = 1;
@@ -909,7 +771,7 @@ function mkCondRespDia(){
}
}
- //add the response which are delete.
+ // add the response which are delete.
for (var i in oldResp){
oldString += ',"' + i + '"';
}
@@ -917,7 +779,7 @@ function mkCondRespDia(){
oldString = oldString.substr(1);
}
- //add the response which are new add
+ // add the response which are new add
for (var i in newResp){
newString += ',"' + i +'"';
}
@@ -954,14 +816,14 @@ function mkCondRespDia(){
* @param
* @return
- *
+ *
*/
function chCondScopeDia(){
var diaDiv = $('');
var tableContent = '
Condition Name
Group Name
';
tableContent += '
';
- //add the conditions into fieldset
+ // add the conditions into fieldset
if ('' == globalCondition){
tableContent += 'Getting predefined conditions, open this dislogue later.';
}
@@ -970,7 +832,7 @@ function chCondScopeDia(){
}
tableContent += '
';
- //add the groups into table
+ // add the groups into table
var groups = $.cookie('groups').split(',');
for (var i in groups){
tableContent += '' + groups[i] + ' ';
@@ -978,9 +840,9 @@ function chCondScopeDia(){
tableContent += '
';
diaDiv.append(tableContent);
- //fieldset to show status
+ // fieldset to show status
diaDiv.append('');
- //create the dislogue
+ // create the dislogue
diaDiv.dialog({
modal: true,
width: 500,
@@ -1048,7 +910,7 @@ function chCondScopeDia(){
* @param
* @return
- *
+ *
*/
function mkResponseDia(){
var diaDiv = $('
');
@@ -1079,7 +941,7 @@ function mkResponseDia(){
* @param
* @return
- *
+ *
*/
function startStopCondRespDia(){
var diaDiv = $('
');
@@ -1193,7 +1055,7 @@ function startStopCondRespDia(){
* @param
* @return
- *
+ *
*/
function stopCondRespDia(){
var diaDiv = $('
');
@@ -1263,7 +1125,7 @@ function stopCondRespDia(){
* @param
* @return
- *
+ *
*/
function createConditionTd(cond){
var conditions = cond.split(';');
@@ -1286,7 +1148,7 @@ function createConditionTd(cond){
* @param
* @return
- *
+ *
*/
function createAssociationTable(cond){
var conditions = cond.split(';');
diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js
index 3beb9d44b..4df1e32fe 100644
--- a/xCAT-UI/js/ui.js
+++ b/xCAT-UI/js/ui.js
@@ -508,6 +508,7 @@ function initPage() {
} else if (page == 'monitor.php') {
includeJs("js/jquery/jquery.jqplot.min.js");
includeJs("js/jquery/jqplot.pieRenderer.min.js");
+ includeJs("js/jquery/jqplot.dateAxisRenderer.min.js");
includeJs("js/monitor/xcatmon.js");
includeJs("js/monitor/rmcmon.js");
includeJs("js/monitor/gangliamon.js");