Skip to content

Commit fe2917e

Browse files
yadvryadvr
committed
Merge pull request apache#1038 from shapeblue/metrics-master
Metrics views for CloudStack UIFS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Metrics+Views+for+CloudStack+UI JIRA: https://issues.apache.org/jira/browse/CLOUDSTACK-9020 * pr/1038: CLOUDSTACK-9020: Increase UI container width by 200px CLOUDSTACK-9020: add ipaddress in instances view CLOUDSTACK-9020: Make UI pagesize configurable CLOUDSTACK-9020: Metrics views for CloudStack UI CLOUDSTACK-9020: Implement collapsible columns and threshold colorings CLOUDSTACK-9020: Implement sorting for tables CLOUDSTACK-9020: Method to remove last panel from the breadcrumb CLOUDSTACK-9020: Add new status icons and css rules Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents 219da64 + aa60995 commit fe2917e

17 files changed

Lines changed: 1852 additions & 93 deletions

File tree

‎api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public class ApiServiceConfiguration implements Configurable {
2626
public static final ConfigKey<String> ManagementHostIPAdr = new ConfigKey<String>("Advanced", String.class, "host", "localhost", "The ip address of management server", true);
2727
public static final ConfigKey<String> ApiServletPath = new ConfigKey<String>("Advanced", String.class, "endpointe.url", "http://localhost:8080/client/api",
2828
"API end point. Can be used by CS components/services deployed remotely, for sending CS API requests", true);
29+
public static final ConfigKey<Long> DefaultUIPageSize = new ConfigKey<Long>("Advanced", Long.class, "default.ui.page.size", "20",
30+
"The default pagesize to be used by UI and other clients when making list* API calls", true, ConfigKey.Scope.Global);
2931

3032
@Override
3133
public String getConfigComponentName() {
@@ -34,7 +36,7 @@ public String getConfigComponentName() {
3436

3537
@Override
3638
public ConfigKey<?>[] getConfigKeys() {
37-
return new ConfigKey<?>[] {ManagementHostIPAdr, ApiServletPath};
39+
return new ConfigKey<?>[] {ManagementHostIPAdr, ApiServletPath, DefaultUIPageSize};
3840
}
3941

4042
}

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,41 @@ label.menu.virtual.appliances=Virtual Appliances
842842
label.menu.virtual.resources=Virtual Resources
843843
label.menu.volumes=Volumes
844844
label.menu.sshkeypair=SSH KeyPair
845+
label.metrics=Metrics
846+
label.metrics.allocated=Allocated
847+
label.metrics.clusters=Clusters
848+
label.metrics.cpu.allocated=CPU Allocation
849+
label.metrics.cpu.max.dev=Deviation
850+
label.metrics.cpu.total=Total
851+
label.metrics.cpu.usage=CPU Usage
852+
label.metrics.cpu.used.avg=Used
853+
label.metrics.disk=Disk
854+
label.metrics.disk.iops.total=IOPS
855+
label.metrics.disk.read=Read
856+
label.metrics.disk.size=Size
857+
label.metrics.disk.storagetype=Type
858+
label.metrics.disk.usage=Disk Usage
859+
label.metrics.disk.used=Used
860+
label.metrics.disk.total=Total
861+
label.metrics.disk.allocated=Allocated
862+
label.metrics.disk.unallocated=Unallocated
863+
label.metrics.disk.write=Write
864+
label.metrics.hosts=Hosts
865+
label.metrics.memory.allocated=Mem Allocation
866+
label.metrics.memory.max.dev=Deviation
867+
label.metrics.memory.total=Total
868+
label.metrics.memory.usage=Mem Usage
869+
label.metrics.memory.used.avg=Used
870+
label.metrics.name=Name
871+
label.metrics.network.usage=Network Usage
872+
label.metrics.network.read=Read
873+
label.metrics.network.write=Write
874+
label.metrics.num.cpu.cores=Cores
875+
label.metrics.property=Property
876+
label.metrics.scope=Scope
877+
label.metrics.state=State
878+
label.metrics.storagepool=Storage Pool
879+
label.metrics.vm.name=VM Name
845880
label.migrate.instance.to.host=Migrate instance to another host
846881
label.migrate.instance.to.ps=Migrate instance to another primary storage
847882
label.migrate.instance.to=Migrate instance to

0 commit comments

Comments
 (0)