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

metrics: add threshold coloring in case of storagepool 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-10-29 15:35:02 +05:30
parent 3b98b13ed3
commit 56aeca5407
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ui/scripts/metrics.js
View File

@ -987,13 +987,23 @@
collapsible: true,
columns: {
disksizeused: {
label: 'label.metrics.disk.used'
label: 'label.metrics.disk.used',
thresholdcolor: true,
thresholds: {
notification: 'storagenotificationthreshold',
disable: 'storagedisablethreshold'
}
},
disksizetotal: {
label: 'label.metrics.disk.total'
},
disksizeallocated: {
label: 'label.metrics.disk.allocated'
label: 'label.metrics.disk.allocated',
thresholdcolor: true,
thresholds: {
notification: 'storageallocatednotificationthreshold',
disable: 'storageallocateddisablethreshold'
}
},
disksizeunallocated: {
label: 'label.metrics.disk.unallocated'
@ -1033,6 +1043,45 @@
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';
// Threshold color coding
items[idx].storagenotificationthreshold = 0.75 * parseFloat(items[idx].disksizetotal);
items[idx].storagedisablethreshold = 0.95 * parseFloat(items[idx].disksizetotal);
items[idx].storageallocatednotificationthreshold = 0.75 * parseFloat(items[idx].disksizetotal);
items[idx].storageallocateddisablethreshold = 0.95 * parseFloat(items[idx].disksizetotal);
var getThresholds = function(data, items, idx) {
data.listAll = true;
$.ajax({
url: createURL('listConfigurations'),
data: data,
success: function(json) {
if (json.listconfigurationsresponse && json.listconfigurationsresponse.configuration) {
$.each(json.listconfigurationsresponse.configuration, function(i, config) {
switch (config.name) {
case 'cluster.storage.allocated.capacity.notificationthreshold':
items[idx].storageallocatednotificationthreshold = parseFloat(config.value) * parseFloat(items[idx].disksizetotal);
break;
case 'cluster.storage.capacity.notificationthreshold':
items[idx].storagenotificationthreshold = parseFloat(config.value) * parseFloat(items[idx].disksizetotal);
break;
case 'pool.storage.allocated.capacity.disablethreshold':
items[idx].storageallocateddisablethreshold = parseFloat(config.value) * parseFloat(items[idx].disksizetotal);
break;
case 'pool.storage.capacity.disablethreshold':
items[idx].storagedisablethreshold = parseFloat(config.value) * parseFloat(items[idx].disksizetotal);
break;
}
});
}
},
async: false
});
};
// Update global and cluster level thresholds
getThresholds({}, items, idx);
getThresholds({clusterid: pool.clusterid}, items, idx);
});
}
args.response.success({

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

@ -104,7 +104,7 @@
var jsonObj = $target.closest('tr').data('jsonObj');
if (filterMetricView.filterKey && jsonObj) {
if (jsonObj.hasOwnProperty(filterMetricView.filterKey)) {
id = jsonObj[filterMetricView.filterKey];
id = jsonObj[filterMetricView.filterKey];
} else {
return; // return if provided key is missing
}