Skip to content

ui: improve metrics view implementation #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Jan 18, 2016
Merged

ui: improve metrics view implementation #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions ui/scripts/metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,8 @@
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
disable: 'cpudisablethreshold'
notification: 'cpuallocatednotificationthreshold',
disable: 'cpuallocateddisablethreshold'
}
}
}
Expand All @@ -600,8 +600,8 @@
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
disable: 'memdisablethreshold'
notification: 'memallocatednotificationthreshold',
disable: 'memallocateddisablethreshold'
}
}
}
Expand Down Expand Up @@ -656,11 +656,31 @@
items[idx].networkwrite = '';
}

var cpuOverCommit = 1.0;
var memOverCommit = 1.0;
$.ajax({
url: createURL('listClusters'),
data: {clusterid: host.clusterid, listAll: true},
success: function(json) {
if (json.listclustersresponse && json.listclustersresponse.cluster) {
var cluster = json.listclustersresponse.cluster[0];
cpuOverCommit = parseFloat(cluster.cpuovercommitratio);
memOverCommit = parseFloat(cluster.memoryovercommitratio);
}
},
async: false
});

// Threshold color coding
items[idx].cpunotificationthreshold = 0.75 * parseFloat(items[idx].cputotal);
items[idx].cpudisablethreshold = 0.95 * parseFloat(items[idx].cputotal);
items[idx].cpuallocatednotificationthreshold = 0.75 * cpuOverCommit * parseFloat(items[idx].cputotal);
items[idx].cpuallocateddisablethreshold = 0.95 * cpuOverCommit * parseFloat(items[idx].cputotal);

items[idx].memnotificationthreshold = 0.75 * parseFloat(items[idx].memtotal);
items[idx].memdisablethreshold = 0.95 * parseFloat(items[idx].memtotal);
items[idx].memallocatednotificationthreshold = 0.75 * memOverCommit * parseFloat(items[idx].memtotal);
items[idx].memallocateddisablethreshold = 0.95 * memOverCommit * parseFloat(items[idx].memtotal);

$.ajax({
url: createURL('listConfigurations'),
Expand All @@ -671,15 +691,19 @@
switch (config.name) {
case 'cluster.cpu.allocated.capacity.disablethreshold':
items[idx].cpudisablethreshold = parseFloat(config.value) * parseFloat(items[idx].cputotal);
items[idx].cpuallocateddisablethreshold = parseFloat(config.value) * cpuOverCommit * parseFloat(items[idx].cputotal);
break;
case 'cluster.cpu.allocated.capacity.notificationthreshold':
items[idx].cpunotificationthreshold = parseFloat(config.value) * parseFloat(items[idx].cputotal);
items[idx].cpuallocatednotificationthreshold = parseFloat(config.value) * cpuOverCommit * parseFloat(items[idx].cputotal);
break;
case 'cluster.memory.allocated.capacity.disablethreshold':
items[idx].memdisablethreshold = parseFloat(config.value) * parseFloat(items[idx].memtotal);
items[idx].memallocateddisablethreshold = parseFloat(config.value) * memOverCommit * parseFloat(items[idx].memtotal);
break;
case 'cluster.memory.allocated.capacity.notificationthreshold':
items[idx].memnotificationthreshold = parseFloat(config.value) * parseFloat(items[idx].memtotal);
items[idx].memallocatednotificationthreshold = parseFloat(config.value) * memOverCommit * parseFloat(items[idx].memtotal);
break;
}
});
Expand All @@ -688,20 +712,6 @@
async: false
});

var cpuOverCommit = 1.0;
var memOverCommit = 1.0;
$.ajax({
url: createURL('listClusters'),
data: {clusterid: host.clusterid, listAll: true},
success: function(json) {
if (json.listclustersresponse && json.listclustersresponse.cluster) {
var cluster = json.listclustersresponse.cluster[0];
cpuOverCommit = cluster.cpuovercommitratio;
memOverCommit = cluster.memoryovercommitratio;
}
},
async: false
});

items[idx].cputotal = items[idx].cputotal + ' Ghz (x' + cpuOverCommit + ')';
items[idx].memtotal = items[idx].memtotal + ' (x' + memOverCommit + ')';
Expand Down Expand Up @@ -1081,13 +1091,13 @@
$.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);
items[idx].storageallocatednotificationthreshold = parseFloat(config.value) * items[idx].overprovisionfactor * 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);
items[idx].storageallocateddisablethreshold = parseFloat(config.value) * items[idx].overprovisionfactor * parseFloat(items[idx].disksizetotal);
break;
case 'pool.storage.capacity.disablethreshold':
items[idx].storagedisablethreshold = parseFloat(config.value) * parseFloat(items[idx].disksizetotal);
Expand Down
125 changes: 97 additions & 28 deletions ui/scripts/ui-custom/metricsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,79 @@
(function($, cloudStack) {

cloudStack.uiCustom.metricsView = function(args) {
return function() {
return function(ctxArgs) {

var metricsListView = cloudStack.sections.metrics.listView;
var metricsLabel = _l('label.metrics');
var context = {};
if (ctxArgs && ctxArgs.hasOwnProperty('context')) {
context = ctxArgs.context;
}

if (args.resource == 'zones') {
metricsListView = cloudStack.sections.metrics.zones.listView;
metricsLabel = _l('label.zones') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.zones.listView;

} else if (args.resource == 'clusters') {
metricsListView = cloudStack.sections.metrics.clusters.listView;
metricsLabel = _l('label.clusters') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.clusters.listView;

} else if (args.resource == 'hosts') {
metricsListView = cloudStack.sections.metrics.hosts.listView;
metricsLabel = _l('label.hosts') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.hosts.listView;

if (context && !context.filterBy) {
if (context.hasOwnProperty('clusters') && context.clusters[0]) {
context.filterBy = 'clusterid';
context.id = context.clusters[0].id;
}
if (context.hasOwnProperty('instances') && context.instances[0]) {
context.filterBy = 'virtualmachineid';
context.id = context.instances[0].id;
}
}
} else if (args.resource == 'storagepool') {
metricsListView = cloudStack.sections.metrics.storagepool.listView;
metricsLabel = _l('label.primary.storage') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.storagepool.listView;

} else if (args.resource == 'vms') {
metricsListView = cloudStack.sections.metrics.instances.listView;
metricsLabel = _l('label.instances') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.instances.listView;
metricsListView.advSearchFields = cloudStack.sections.instances.listView.advSearchFields;

if (context && !context.filterBy) {
if (context.hasOwnProperty('hosts') && context.hosts[0]) {
context.filterBy = 'hostid';
context.id = context.hosts[0].id;
}
}
} else if (args.resource == 'volumes') {
metricsListView = cloudStack.sections.metrics.volumes.listView;
metricsLabel = _l('label.volumes') + ' ' + metricsLabel;
metricsListView = cloudStack.sections.metrics.volumes.listView;
metricsListView.advSearchFields = cloudStack.sections.storage.sections.volumes.listView.advSearchFields;
metricsListView.groupableColumns = false;

if (context && !context.filterBy) {
if (context.hasOwnProperty('instances') && context.instances[0]) {
context.filterBy = 'virtualmachineid';
context.id = context.instances[0].id;
}
if (context.hasOwnProperty('primarystorages') && context.primarystorages[0]) {
context.filterBy = 'storageid';
context.id = context.primarystorages[0].id;
}
}
}

if (context.metricsFilterData) {
delete context.metricsFilterData;
}

if (context.filterBy) {
context.metricsFilterData = {
key: context.filterBy,
value: context.id
};
}

// list view refresh button
Expand All @@ -56,24 +107,40 @@
}
};

metricsListView.hideSearchBar = true;
metricsListView.hideSearchBar = false;
metricsListView.needsRefresh = true;
metricsListView.noSplit = true;
metricsListView.horizontalOverflow = true;
metricsListView.groupableColumns = true;

if (args.resource == 'volumes') {
metricsListView.groupableColumns = false;
}
if (args.resource != 'vms' && args.resource != 'volumes' && args.resource != 'zones') {
metricsListView.advSearchFields = {
name: {
label: 'label.name'
},
zoneid: {
label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
data: {
listAll: true
},
success: function(json) {
var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];

var metricsContext = cloudStack.context;
if (metricsContext.metricsFilterData) {
delete metricsContext.metricsFilterData;
}
if (args.filterBy) {
metricsContext.metricsFilterData = {
key: args.filterBy,
value: args.id
args.response.success({
data: $.map(zones, function(zone) {
return {
id: zone.id,
description: zone.name
};
})
});
}
});
}
}
};
}

Expand All @@ -84,7 +151,7 @@
complete: function($newPanel) {
$newPanel.listView({
$browser: $browser,
context: metricsContext,
context: context,
listView: metricsListView
});
// Make metrics tables horizontally scrollable
Expand All @@ -105,31 +172,33 @@
}
}
$browser.cloudBrowser('removeLastPanel', {});
var refreshedPanel = cloudStack.uiCustom.metricsView(args)();
var refreshedPanel = cloudStack.uiCustom.metricsView(args)(ctxArgs);
if (wasSorted && thClassName) {
refreshedPanel.find('th.' + thClassName).filter(function() {
return $(this).index() == thIndex;
}).addClass('sorted').addClass(sortClassName);
}
});

var filterMetricView = metricsListView.browseBy;
if (filterMetricView) {
var browseBy = metricsListView.browseBy;
if (browseBy) {
$newPanel.bind('click', function(event) {
event.stopPropagation();
var $target = $(event.target);
var id = $target.closest('tr').data('list-view-item-id');
var jsonObj = $target.closest('tr').data('jsonObj');
if (filterMetricView.filterKey && jsonObj) {
if (jsonObj.hasOwnProperty(filterMetricView.filterKey)) {
id = jsonObj[filterMetricView.filterKey];
if (browseBy.filterKey && jsonObj) {
if (jsonObj.hasOwnProperty(browseBy.filterKey)) {
id = jsonObj[browseBy.filterKey];
} else {
return; // return if provided key is missing
}
}
if (id && ($target.hasClass('first') || $target.parent().hasClass('first')) && ($target.is('td') || $target.parent().is('td'))) {
filterMetricView.id = id;
cloudStack.uiCustom.metricsView(filterMetricView)();
context.id = id;
context.filterBy = browseBy.filterBy;
ctxArgs.context = context;
cloudStack.uiCustom.metricsView({resource: browseBy.resource})(ctxArgs);
}
});
}
Expand Down