etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

metrics: add storagepool metrics view 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-10-20 16:07:15 +05:30
parent 22038c9eec
commit 357f0fb9e9
3 changed files with 107 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
ui/scripts/metrics.js
View File

@ -836,19 +836,6 @@
name: {
label: 'label.metrics.name'
},
state: {
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
},
indicator: {
'Ready': 'on',
'Allocated': 'warning',
'Destroyed': 'off'
},
compact: true
},
vmname: {
label: 'label.metrics.vm.name'
},
@ -863,8 +850,6 @@
},
},
dataProvider: function(args) {
console.log('in vlumes');
console.log(args);
var data = {listAll: true};
listViewDataProvider(args, data);
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
@ -882,21 +867,9 @@
items[idx].vmname = volume.vmname;
items[idx].diskoffering = volume.diskofferingname;
items[idx].disksize = parseFloat(volume.size)/(1024.0*1024.0*1024.0) + "GB";
items[idx].storagetype = volume.storagetype;
var keys = [{'memoryused': 'memused'},
{'networkkbsread': 'networkread'},
{'networkkbswrite': 'networkwrite'},
{'diskkbsread': 'diskread'},
{'diskkbswrite': 'diskwrite'},
{'diskioread': 'diskiopstotal'}];
for (keyIdx in keys) {
var map = keys[keyIdx];
var key = Object.keys(map)[0];
var uiKey = map[key];
if (!volume.hasOwnProperty(key)) {
items[idx][uiKey] = 'N/A';
}
items[idx].storagetype = volume.storagetype.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
if (volume.storage) {
items[idx].storagetype += " (" + volume.storage + ")";
}
});
}
@ -907,14 +880,109 @@
});
},
browseBy: {
filterBy: 'virtualmachineid',
resource: 'vms'
filterBy: 'storageid',
resource: 'storagepool'
},
detailView: cloudStack.sections.storage.sections.volumes.listView.detailView
}
};
// Storage Pool Metrics
cloudStack.sections.metrics.storagepool = {
title: 'label.metrics',
listView: {
id: 'primarystorages',
fields: {
name: {
label: 'label.metrics.name'
},
property: {
label: 'label.metrics.property',
collapsible: true,
columns: {
state: {
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
},
indicator: {
'Up': 'on',
'Down': 'off'
},
compact: true
},
scope: {
label: 'label.metrics.scope'
},
type: {
label: 'label.metrics.disk.storagetype'
},
}
},
disk: {
label: 'label.metrics.disk',
collapsible: true,
columns: {
disksizeused: {
label: 'label.metrics.disk.used'
},
disksizetotal: {
label: 'label.metrics.disk.total'
},
disksizeallocated: {
label: 'label.metrics.disk.allocated'
},
disksizeunallocated: {
label: 'label.metrics.disk.unallocated'
}
}
}
},
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
if (args.context.metricsFilterData && args.context.metricsFilterData.key && args.context.metricsFilterData.value) {
data[args.context.metricsFilterData.key] = args.context.metricsFilterData.value;
}
$.ajax({
url: createURL('listStoragePools'),
data: data,
success: function(json) {
var items = [];
if (json && json.liststoragepoolsresponse && json.liststoragepoolsresponse.storagepool) {
items = json.liststoragepoolsresponse.storagepool;
$.each(items, function(idx, pool) {
items[idx].name = pool.name;
items[idx].state = pool.state;
items[idx].scope = pool.scope;
items[idx].type = pool.type;
items[idx].overprovisionfactor = parseFloat(pool.overprovisionfactor);
items[idx].disksizeused = parseFloat(pool.disksizeused);
items[idx].disksizetotal = parseFloat(pool.disksizetotal);
items[idx].disksizeallocated = parseFloat(pool.disksizeallocated);
items[idx].disksizeunallocated = (items[idx].overprovisionfactor * items[idx].disksizetotal) - items[idx].disksizeallocated;
// Format presentation
items[idx].disksizeused = (items[idx].disksizeused/(1024.0*1024.0*1024.0)).toFixed(2) + "GB";
items[idx].disksizetotal = (items[idx].disksizetotal/(1024.0*1024.0*1024.0)).toFixed(2) + "GB (x" + items[idx].overprovisionfactor + ")";
items[idx].disksizeallocated = (items[idx].disksizeallocated/(1024.0*1024.0*1024.0)).toFixed(2) + "GB";
items[idx].disksizeunallocated = (items[idx].disksizeunallocated/(1024.0*1024.0*1024.0)).toFixed(2) + "GB";
});
}
args.response.success({
data: items
});
}
});
},
browseBy: {
filterBy: 'storageid',
resource: 'volumes'
},
detailView: cloudStack.sections.system.subsections['primary-storage'].listView.detailView
}
};
})(cloudStack);

2
ui/scripts/system.js
View File

@ -17460,7 +17460,7 @@
isHeader: true,
addRow: false,
action: {
custom: cloudStack.uiCustom.metricsView({resource: 'primarystorage'})
custom: cloudStack.uiCustom.metricsView({resource: 'storagepool'})
},
messages: {
notification: function (args) {

7
ui/scripts/ui-custom/metricsView.js
View File

@ -30,7 +30,8 @@
} else if (args.resource == 'hosts') {
metricsListView = cloudStack.sections.metrics.hosts.listView;
metricsLabel = _l('label.hosts') + ' ' + metricsLabel;
} else if (args.resource == 'primarystorage') {
} else if (args.resource == 'storagepool') {
metricsListView = cloudStack.sections.metrics.storagepool.listView;
metricsLabel = _l('label.primary.storage') + ' ' + metricsLabel;
} else if (args.resource == 'vms') {
metricsListView = cloudStack.sections.metrics.instances.listView;
@ -60,6 +61,10 @@
metricsListView.horizontalOverflow = true;
metricsListView.groupableColumns = true;
if (args.resource == 'volumes') {
metricsListView.groupableColumns = false;
}
var metricsContext = cloudStack.context;
if (metricsContext.metricsFilterData) {
delete metricsContext.metricsFilterData;