diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterVmView.java index 7f3396235bf..ef2a964273e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterVmView.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.inject.Inject; @@ -23,6 +24,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterVmPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractUptimeColumn; +import org.ovirt.engine.ui.webadmin.widget.table.column.ColumnResizeTableLineChartProgressBar; import org.ovirt.engine.ui.webadmin.widget.table.column.VmStatusIconColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmTypeColumn; @@ -98,6 +100,41 @@ protected Double getRawValue(VM object) { }; uptimeColumn.makeSortable(VmConditionFieldAutoCompleter.UPTIME); getTable().addColumn(uptimeColumn, constants.uptimeVm(), "220px"); //$NON-NLS-1$ - } + getTable().addColumn(new ColumnResizeTableLineChartProgressBar( + getTable(), + VmConditionFieldAutoCompleter.CPU_USAGE) { + @Override + protected List getProgressValues(VM object) { + return object.getCpuUsageHistory(); + } + }, constants.cpuVm(), "80px"); //$NON-NLS-1$ + + getTable().addColumn(new ColumnResizeTableLineChartProgressBar( + getTable(), + VmConditionFieldAutoCompleter.MEM_USAGE) { + @Override + protected List getProgressValues(VM object) { + return object.getMemoryUsageHistory(); + } + }, constants.memoryVm(), "80px"); //$NON-NLS-1$ + + getTable().addColumn(new ColumnResizeTableLineChartProgressBar( + getTable(), + VmConditionFieldAutoCompleter.NETWORK_USAGE) { + @Override + protected List getProgressValues(VM object) { + return object.getNetworkUsageHistory(); + } + }, constants.networkVm(), "80px"); //$NON-NLS-1$ + + AbstractTextColumn ipColumn = new AbstractTextColumn() { + @Override + public String getValue(VM object) { + return object.getIp(); + } + }; + ipColumn.makeSortable(VmConditionFieldAutoCompleter.IP); + getTable().addColumn(ipColumn, constants.ipVm(), "120px"); //$NON-NLS-1$ + } }