You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/18 16:33:35 UTC
[1/2] git commit: updated refs/heads/4.7 to 57a2a0b
Repository: cloudstack
Updated Branches:
refs/heads/4.7 f0fca6099 -> 57a2a0bef
ui: improve metrics view implementation
- Implement Search boxes in all Metrics views
- Fix threshold calculations for host and storage pool metrics view
- Consider overcommit ratios for calculation allocated thresholds
- Save/pass context while navigating across resources and metrics view
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/750c11b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/750c11b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/750c11b4
Branch: refs/heads/4.7
Commit: 750c11b494fe9100f233c8e9a7ef89c346ccaf2b
Parents: 1f1da0f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Jan 7 15:52:41 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jan 18 12:50:57 2016 +0100
----------------------------------------------------------------------
ui/scripts/metrics.js | 50 ++++++++-----
ui/scripts/ui-custom/metricsView.js | 125 ++++++++++++++++++++++++-------
2 files changed, 127 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/750c11b4/ui/scripts/metrics.js
----------------------------------------------------------------------
diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js
index 609022a..6ac376e 100644
--- a/ui/scripts/metrics.js
+++ b/ui/scripts/metrics.js
@@ -575,8 +575,8 @@
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
- notification: 'cpunotificationthreshold',
- disable: 'cpudisablethreshold'
+ notification: 'cpuallocatednotificationthreshold',
+ disable: 'cpuallocateddisablethreshold'
}
}
}
@@ -600,8 +600,8 @@
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
- notification: 'memnotificationthreshold',
- disable: 'memdisablethreshold'
+ notification: 'memallocatednotificationthreshold',
+ disable: 'memallocateddisablethreshold'
}
}
}
@@ -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'),
@@ -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;
}
});
@@ -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 + ')';
@@ -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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/750c11b4/ui/scripts/ui-custom/metricsView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/metricsView.js b/ui/scripts/ui-custom/metricsView.js
index ef5dbba..fccbd00 100644
--- a/ui/scripts/ui-custom/metricsView.js
+++ b/ui/scripts/ui-custom/metricsView.js
@@ -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
@@ -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
+ };
+ })
+ });
+ }
+ });
+ }
+ }
};
}
@@ -84,7 +151,7 @@
complete: function($newPanel) {
$newPanel.listView({
$browser: $browser,
- context: metricsContext,
+ context: context,
listView: metricsListView
});
// Make metrics tables horizontally scrollable
@@ -105,7 +172,7 @@
}
}
$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;
@@ -113,23 +180,25 @@
}
});
- 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);
}
});
}
[2/2] git commit: updated refs/heads/4.7 to 57a2a0b
Posted by re...@apache.org.
Merge pull request #1347 from shapeblue/4.7-metrics-fixes
ui: improve metrics view implementation- Implement Search boxes in all Metrics views
- Fix threshold calculations for host and storage pool metrics view
- Consider overcommit ratios for calculation allocated thresholds
- Save/pass context while navigating across resources and metrics view
cc @remibergsma @DaanHoogland
* pr/1347:
ui: improve metrics view implementation
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57a2a0be
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57a2a0be
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57a2a0be
Branch: refs/heads/4.7
Commit: 57a2a0beffadf5899e176ea17c2b8d6f4e7da4e8
Parents: f0fca60 750c11b
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 18 16:32:48 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 18 16:32:48 2016 +0100
----------------------------------------------------------------------
ui/scripts/metrics.js | 50 ++++++++-----
ui/scripts/ui-custom/metricsView.js | 125 ++++++++++++++++++++++++-------
2 files changed, 127 insertions(+), 48 deletions(-)
----------------------------------------------------------------------