arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change the X axe label into time format

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8397 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2010-12-14 08:11:08 +00:00
parent dd661c6aa0
commit 726adca155
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-UI/js/monitor/rmcmon.js
View File

@ -3,6 +3,7 @@ var globalNodesDetail;
var globalAllNodesNum = 0;
var globalFinishNodesNum = 0;
var globalSelectedAttributes = '';
var globalTimeStamp;
function loadRmcMon(){
//find the rmcmon tab
@ -236,7 +237,7 @@ function showRmcSummary(returnData){
var attrDiv;
var summaryTable = $('<table><tbody></tbody></table>');
var summaryRow;
globalTimeStamp = new Array();
//load each nodes' status
$.ajax({
url : 'lib/cmd.php',
@ -253,6 +254,15 @@ function showRmcSummary(returnData){
}
});
//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('<h3>Overview</h3><hr />');
$('#rmcmonSummary').append(summaryTable);
@ -264,7 +274,7 @@ function showRmcSummary(returnData){
attrName = attributes[attr].substr(0, temp);
attrValues = attributes[attr].substr(temp + 1).split(',');
for (var i in attrValues){
tempArray.push([i, attrValues[i]]);
tempArray.push([globalTimeStamp[i], attrValues[i]]);
}
if (0 == (attr % 3)){
@ -274,7 +284,7 @@ function showRmcSummary(returnData){
summaryRow.append(tempTd);
attrDiv = $('<div class="monitorsumdiv"></div>');
tempTd.append(attrDiv);
$.plot(attrDiv, [tempArray]);
$.plot(attrDiv, [tempArray], {xaxis: {mode:"time"}});
attrDiv.append('<center>' + attrName + '</center>');
}
@ -429,9 +439,9 @@ function showAllNodes(attrName, type){
var tempData = sortArray[sortIndex]['value'].split(',');
var tempArray = [];
for (var i in tempData){
tempArray.push([i, tempData[i]]);
tempArray.push([globalTimeStamp[i], tempData[i]]);
}
$.plot(nodeChat, [tempArray]);
$.plot(nodeChat, [tempArray], {xaxis: {mode:"time", tickSize: [20, "minute"]}});
tempTd.append('<center>' + sortArray[sortIndex]['name'] + '</center>');
tempTd.css('cursor', 'pointer');
@ -474,10 +484,10 @@ function showNode(nodeName){
var tempData = globalNodesDetail[nodeName][attr].split(',');
var tempArray = [];
for (var i in tempData){
tempArray.push([i, tempData[i]]);
tempArray.push([globalTimeStamp[i], tempData[i]]);
}
$.plot(attrChat, [tempArray]);
$.plot(attrChat, [tempArray], {xaxis: {mode:"time", tickSize: [20, "minute"]}});
attrChat.append('<center>' + attr +'</center>');
}
}

2
xCAT-server/lib/xcat/plugins/web.pm
View File

@ -721,7 +721,7 @@ sub web_rmcmonShow() {
#like this PctTotalTimeIdle=>"10.0000, 20.0000, 12.0000, 30.0000"
if ( 'summary' eq $nodeRange ) {
$output =
xCAT::Utils->runcmd( "monshow rmcmon -s -t 10 -a " . $attr, -1, 1 );
xCAT::Utils->runcmd( "monshow rmcmon -s -t 60 -a " . $attr, -1, 1 );
foreach $temp (@$output) {
#the attribute name