mirror of https://github.com/apache/cloudstack.git
ui: Remove Metrics UI feature
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav
parent
2f250e269b
commit
ea5aecbe07
|
|
@ -831,41 +831,6 @@ label.menu.templates=Templates
|
|||
label.menu.virtual.appliances=Virtual Appliances
|
||||
label.menu.virtual.resources=Virtual Resources
|
||||
label.menu.volumes=Volumes
|
||||
label.metrics=Metrics
|
||||
label.metrics.allocated=Allocated
|
||||
label.metrics.clusters=Clusters
|
||||
label.metrics.cpu.allocated=CPU Allocation
|
||||
label.metrics.cpu.max.dev=Deviation
|
||||
label.metrics.cpu.total=Total
|
||||
label.metrics.cpu.usage=CPU Usage
|
||||
label.metrics.cpu.used.avg=Used
|
||||
label.metrics.disk=Disk
|
||||
label.metrics.disk.iops.total=IOPS
|
||||
label.metrics.disk.read=Read
|
||||
label.metrics.disk.size=Size
|
||||
label.metrics.disk.storagetype=Type
|
||||
label.metrics.disk.usage=Disk Usage
|
||||
label.metrics.disk.used=Used
|
||||
label.metrics.disk.total=Total
|
||||
label.metrics.disk.allocated=Allocated
|
||||
label.metrics.disk.unallocated=Unallocated
|
||||
label.metrics.disk.write=Write
|
||||
label.metrics.hosts=Hosts
|
||||
label.metrics.memory.allocated=Mem Allocation
|
||||
label.metrics.memory.max.dev=Deviation
|
||||
label.metrics.memory.total=Total
|
||||
label.metrics.memory.usage=Mem Usage
|
||||
label.metrics.memory.used.avg=Used
|
||||
label.metrics.name=Name
|
||||
label.metrics.network.usage=Network Usage
|
||||
label.metrics.network.read=Read
|
||||
label.metrics.network.write=Write
|
||||
label.metrics.num.cpu.cores=Cores
|
||||
label.metrics.property=Property
|
||||
label.metrics.scope=Scope
|
||||
label.metrics.state=State
|
||||
label.metrics.storagepool=Storage Pool
|
||||
label.metrics.vm.name=VM Name
|
||||
label.migrate.instance.to.host=Migrate instance to another host
|
||||
label.migrate.instance.to.ps=Migrate instance to another primary storage
|
||||
label.migrate.instance.to=Migrate instance to
|
||||
|
|
|
|||
|
|
@ -832,41 +832,6 @@ dictionary = {
|
|||
'label.menu.virtual.appliances': '<fmt:message key="label.menu.virtual.appliances" />',
|
||||
'label.menu.virtual.resources': '<fmt:message key="label.menu.virtual.resources" />',
|
||||
'label.menu.volumes': '<fmt:message key="label.menu.volumes" />',
|
||||
'label.metrics': '<fmt:message key="label.metrics" />',
|
||||
'label.metrics.allocated': '<fmt:message key="label.metrics.allocated" />',
|
||||
'label.metrics.clusters': '<fmt:message key="label.metrics.clusters" />',
|
||||
'label.metrics.cpu.allocated': '<fmt:message key="label.metrics.cpu.allocated" />',
|
||||
'label.metrics.cpu.max.dev': '<fmt:message key="label.metrics.cpu.max.dev" />',
|
||||
'label.metrics.cpu.total': '<fmt:message key="label.metrics.cpu.total" />',
|
||||
'label.metrics.cpu.usage': '<fmt:message key="label.metrics.cpu.usage" />',
|
||||
'label.metrics.cpu.used.avg': '<fmt:message key="label.metrics.cpu.used.avg" />',
|
||||
'label.metrics.disk': '<fmt:message key="label.metrics.disk" />',
|
||||
'label.metrics.disk.iops.total': '<fmt:message key="label.metrics.disk.iops.total" />',
|
||||
'label.metrics.disk.read': '<fmt:message key="label.metrics.disk.read" />',
|
||||
'label.metrics.disk.size': '<fmt:message key="label.metrics.disk.size" />',
|
||||
'label.metrics.disk.storagetype': '<fmt:message key="label.metrics.disk.storagetype" />',
|
||||
'label.metrics.disk.usage': '<fmt:message key="label.metrics.disk.usage" />',
|
||||
'label.metrics.disk.used': '<fmt:message key="label.metrics.disk.used" />',
|
||||
'label.metrics.disk.total': '<fmt:message key="label.metrics.disk.total" />',
|
||||
'label.metrics.disk.allocated': '<fmt:message key="label.metrics.disk.allocated" />',
|
||||
'label.metrics.disk.unallocated': '<fmt:message key="label.metrics.disk.unallocated" />',
|
||||
'label.metrics.disk.write': '<fmt:message key="label.metrics.disk.write" />',
|
||||
'label.metrics.hosts': '<fmt:message key="label.metrics.hosts" />',
|
||||
'label.metrics.memory.allocated': '<fmt:message key="label.metrics.memory.allocated" />',
|
||||
'label.metrics.memory.max.dev': '<fmt:message key="label.metrics.memory.max.dev" />',
|
||||
'label.metrics.memory.total': '<fmt:message key="label.metrics.memory.total" />',
|
||||
'label.metrics.memory.usage': '<fmt:message key="label.metrics.memory.usage" />',
|
||||
'label.metrics.memory.used.avg': '<fmt:message key="label.metrics.memory.used.avg" />',
|
||||
'label.metrics.name': '<fmt:message key="label.metrics.name" />',
|
||||
'label.metrics.network.read': '<fmt:message key="label.metrics.network.read" />',
|
||||
'label.metrics.network.usage': '<fmt:message key="label.metrics.network.usage" />',
|
||||
'label.metrics.network.write': '<fmt:message key="label.metrics.network.write" />',
|
||||
'label.metrics.num.cpu.cores': '<fmt:message key="label.metrics.num.cpu.cores" />',
|
||||
'label.metrics.property': '<fmt:message key="label.metrics.property" />',
|
||||
'label.metrics.scope': '<fmt:message key="label.metrics.scope" />',
|
||||
'label.metrics.state': '<fmt:message key="label.metrics.state" />',
|
||||
'label.metrics.storagepool': '<fmt:message key="label.metrics.storagepool" />',
|
||||
'label.metrics.vm.name': '<fmt:message key="label.metrics.vm.name" />',
|
||||
'label.migrate.instance.to': '<fmt:message key="label.migrate.instance.to" />',
|
||||
'label.migrate.instance.to.host': '<fmt:message key="label.migrate.instance.to.host" />',
|
||||
'label.migrate.instance.to.ps': '<fmt:message key="label.migrate.instance.to.ps" />',
|
||||
|
|
|
|||
|
|
@ -1763,7 +1763,6 @@
|
|||
<script type="text/javascript" src="scripts/ui-custom/granularSettings.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/zoneChart.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/dashboard.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/metricsView.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/installWizard.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/installWizard.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/projects.js?t=<%=now%>"></script>
|
||||
|
|
@ -1800,7 +1799,6 @@
|
|||
<script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/ui-custom/saml.js?t=<%=now%>"></script>
|
||||
<script type="text/javascript" src="scripts/metrics.js?t=<%=now%>"></script>
|
||||
|
||||
<!-- Plugin/module API -->
|
||||
<script type="text/javascript" src="scripts/ui-custom/pluginListing.js?t=<%=now%>"></script>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,140 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
(function($, cloudStack) {
|
||||
|
||||
cloudStack.uiCustom.metricsView = function(args) {
|
||||
return function() {
|
||||
var metricsListView = cloudStack.sections.metrics.listView;
|
||||
var metricsLabel = _l('label.metrics');
|
||||
|
||||
if (args.resource == 'zones') {
|
||||
metricsListView = cloudStack.sections.metrics.zones.listView;
|
||||
metricsLabel = _l('label.zones') + ' ' + metricsLabel;
|
||||
} else if (args.resource == 'clusters') {
|
||||
metricsListView = cloudStack.sections.metrics.clusters.listView;
|
||||
metricsLabel = _l('label.clusters') + ' ' + metricsLabel;
|
||||
} else if (args.resource == 'hosts') {
|
||||
metricsListView = cloudStack.sections.metrics.hosts.listView;
|
||||
metricsLabel = _l('label.hosts') + ' ' + metricsLabel;
|
||||
} 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;
|
||||
metricsLabel = _l('label.instances') + ' ' + metricsLabel;
|
||||
} else if (args.resource == 'volumes') {
|
||||
metricsListView = cloudStack.sections.metrics.volumes.listView;
|
||||
metricsLabel = _l('label.volumes') + ' ' + metricsLabel;
|
||||
}
|
||||
|
||||
// list view refresh button
|
||||
metricsListView.actions = {
|
||||
refreshMetrics: {
|
||||
label: 'label.refresh',
|
||||
isHeader: true,
|
||||
addRow: true,
|
||||
action: {
|
||||
custom: function (args) {
|
||||
return function() {
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
metricsListView.hideSearchBar = true;
|
||||
metricsListView.needsRefresh = true;
|
||||
metricsListView.noSplit = true;
|
||||
metricsListView.horizontalOverflow = true;
|
||||
metricsListView.groupableColumns = true;
|
||||
|
||||
if (args.resource == 'volumes') {
|
||||
metricsListView.groupableColumns = false;
|
||||
}
|
||||
|
||||
var metricsContext = cloudStack.context;
|
||||
if (metricsContext.metricsFilterData) {
|
||||
delete metricsContext.metricsFilterData;
|
||||
}
|
||||
if (args.filterBy) {
|
||||
metricsContext.metricsFilterData = {
|
||||
key: args.filterBy,
|
||||
value: args.id
|
||||
};
|
||||
}
|
||||
|
||||
var $browser = $('#browser .container');
|
||||
return $browser.cloudBrowser('addPanel', {
|
||||
title: metricsLabel,
|
||||
maximizeIfSelected: true,
|
||||
complete: function($newPanel) {
|
||||
$newPanel.listView({
|
||||
$browser: $browser,
|
||||
context: metricsContext,
|
||||
listView: metricsListView
|
||||
});
|
||||
// Make metrics tables horizontally scrollable
|
||||
$newPanel.find('.list-view').css({'overflow-x': 'visible'});
|
||||
// Refresh metrics when refresh button is clicked
|
||||
$newPanel.find('.refreshMetrics').click(function() {
|
||||
var sortedTh = $newPanel.find('table thead tr:last th.sorted');
|
||||
var thIndex = sortedTh.index();
|
||||
var thClassName = null;
|
||||
var wasSorted = false;
|
||||
var sortClassName = 'asc';
|
||||
if (sortedTh && sortedTh.hasClass('sorted')) {
|
||||
wasSorted = true;
|
||||
var classes = sortedTh.attr('class').split(/\s+/);
|
||||
thClassName = classes[0];
|
||||
if (classes.indexOf('desc') > -1) {
|
||||
sortClassName = 'desc';
|
||||
}
|
||||
}
|
||||
$browser.cloudBrowser('removeLastPanel', {});
|
||||
var refreshedPanel = cloudStack.uiCustom.metricsView(args)();
|
||||
if (wasSorted && thClassName) {
|
||||
refreshedPanel.find('th.' + thClassName).filter(function() {
|
||||
return $(this).index() == thIndex;
|
||||
}).addClass('sorted').addClass(sortClassName);
|
||||
}
|
||||
});
|
||||
|
||||
var filterMetricView = metricsListView.browseBy;
|
||||
if (filterMetricView) {
|
||||
$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];
|
||||
} 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)();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
};
|
||||
})(jQuery, cloudStack);
|
||||
Loading…
Reference in New Issue