etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

metrics: refactor all labels under label.metrics namespace 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-10-16 14:49:51 +05:30
parent 29fc9dd1bd
commit 9bea76a2ac
3 changed files with 106 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/WEB-INF/classes/resources/messages.properties
View File

@ -485,10 +485,6 @@ label.cpu.limits=CPU limits
label.cpu.mhz=CPU (in MHz)
label.cpu.utilized=CPU Utilized
label.cpu=CPU
label.cpu.usage=CPU Usage
label.cpu.used.avg=Average CPU
label.cpu.max.dev=CPU Max Deviation
label.cpu.total.ghz=Total CPU (Ghz)
label.create.project=Create project
label.create.template=Create template
label.create.VPN.connection=Create VPN Connection
@ -795,10 +791,6 @@ label.memory.mb=Memory (in MB)
label.memory.total=Memory Total
label.memory.used=Memory Used
label.memory=Memory
label.memory.usage=Memory Usage
label.memory.used.avg=Average Memory
label.memory.max.dev=Mem Max Deviation
label.memory.total.gb=Total Memory (GB)
label.menu.accounts=Accounts
label.menu.alerts=Alerts
label.menu.all.accounts=All Accounts
@ -840,6 +832,29 @@ 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 Allocated
label.metrics.cpu.max.dev=CPU Max Dev
label.metrics.cpu.total.ghz=Total CPU GHz
label.metrics.cpu.usage=CPU Usage
label.metrics.cpu.used.avg=Avg CPU
label.metrics.disk.iops.total=IOPS Total
label.metrics.disk.read.bytes=Disk Read Bytes
label.metrics.disk.usage=Disk Usage
label.metrics.disk.write.bytes=Disk Write Bytes
label.metrics.hosts=Hosts
label.metrics.memory.allocated=Mem Allocated
label.metrics.memory.max.dev=Mem Max Dev
label.metrics.memory.total.gb=Total Mem GB
label.metrics.memory.usage=Memory Usage
label.metrics.memory.used.avg=Avg Mem
label.metrics.name=Name
label.metrics.network.usage=Network Usage
label.metrics.network.read=Net Read GB
label.metrics.network.write=Net Write GB
label.metrics.num.cpu.cores=Cores
label.metrics.state=State
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

31
ui/dictionary.jsp
View File

@ -500,10 +500,6 @@ dictionary = {
'label.cpu.limits': '<fmt:message key="label.cpu.limits" />',
'label.cpu.mhz': '<fmt:message key="label.cpu.mhz" />',
'label.cpu.utilized': '<fmt:message key="label.cpu.utilized" />',
'label.cpu.usage': '<fmt:message key="label.cpu.usage" />',
'label.cpu.used.avg': '<fmt:message key="label.cpu.used.avg" />',
'label.cpu.max.dev': '<fmt:message key="label.cpu.max.dev" />',
'label.cpu.total.ghz': '<fmt:message key="label.cpu.total.ghz" />',
'label.created.by.system': '<fmt:message key="label.created.by.system" />',
'label.created': '<fmt:message key="label.created" />',
'label.create.project': '<fmt:message key="label.create.project" />',
@ -796,10 +792,6 @@ dictionary = {
'label.memory.mb': '<fmt:message key="label.memory.mb" />',
'label.memory.total': '<fmt:message key="label.memory.total" />',
'label.memory.used': '<fmt:message key="label.memory.used" />',
'label.memory.usage': '<fmt:message key="label.memory.usage" />',
'label.memory.used.avg': '<fmt:message key="label.memory.used.avg" />',
'label.memory.max.dev': '<fmt:message key="label.memory.max.dev" />',
'label.memory.total.gb': '<fmt:message key="label.memory.total.gb" />',
'label.menu.accounts': '<fmt:message key="label.menu.accounts" />',
'label.menu.alerts': '<fmt:message key="label.menu.alerts" />',
'label.menu.all.accounts': '<fmt:message key="label.menu.all.accounts" />',
@ -841,6 +833,29 @@ dictionary = {
'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.ghz': '<fmt:message key="label.metrics.cpu.total.ghz" />',
'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.iops.total': '<fmt:message key="label.metrics.disk.iops.total" />',
'label.metrics.disk.read.bytes': '<fmt:message key="label.metrics.disk.read.bytes" />',
'label.metrics.disk.usage': '<fmt:message key="label.metrics.disk.usage" />',
'label.metrics.disk.write.bytes': '<fmt:message key="label.metrics.disk.write.bytes" />',
'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.gb': '<fmt:message key="label.metrics.memory.total.gb" />',
'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.state': '<fmt:message key="label.metrics.state" />',
'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" />',

120
ui/scripts/metrics.js
View File

@ -35,10 +35,10 @@
id: 'zones',
fields: {
name: {
label: 'label.name'
label: 'label.metrics.name'
},
state: {
label: 'label.state',
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
@ -51,14 +51,14 @@
}
},
clusters : {
label: 'label.clusters'
label: 'label.metrics.clusters'
},
cpuused: {
label: 'label.cpu.usage',
label: 'label.metrics.cpu.usage',
collapsible: true,
columns: {
cpuusedavg: {
label: 'label.cpu.used.avg',
label: 'label.metrics.cpu.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -66,16 +66,16 @@
}
},
cpumaxdev: {
label: 'label.cpu.max.dev'
label: 'label.metrics.cpu.max.dev'
}
}
},
cpuallocated: {
label: 'label.cpu.allocated',
label: 'label.metrics.cpu.allocated',
collapsible: true,
columns: {
cpuallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -83,16 +83,16 @@
}
},
cputotal: {
label: 'label.cpu.total.ghz'
label: 'label.metrics.cpu.total.ghz'
}
}
},
memused: {
label: 'label.memory.usage',
label: 'label.metrics.memory.usage',
collapsible: true,
columns: {
memusedavg: {
label: 'label.memory.used.avg',
label: 'label.metrics.memory.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -100,16 +100,16 @@
}
},
memmaxdev: {
label: 'label.memory.max.dev'
label: 'label.metrics.memory.max.dev'
}
}
},
memallocated: {
label: 'label.memory.allocated',
label: 'label.metrics.memory.allocated',
collapsible: true,
columns: {
memallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -117,7 +117,7 @@
}
},
memtotal: {
label: 'label.memory.total.gb'
label: 'label.metrics.memory.total.gb'
}
}
}
@ -267,10 +267,10 @@
id: 'clusters',
fields: {
name: {
label: 'label.name'
label: 'label.metrics.name'
},
state: {
label: 'label.state',
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
@ -283,14 +283,14 @@
}
},
hosts: {
label: 'label.hosts'
label: 'label.metrics.hosts'
},
cpuused: {
label: 'label.cpu.usage',
label: 'label.metrics.cpu.usage',
collapsible: true,
columns: {
cpuusedavg: {
label: 'label.cpu.used.avg',
label: 'label.metrics.cpu.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -298,16 +298,16 @@
}
},
cpumaxdev: {
label: 'label.cpu.max.dev'
label: 'label.metrics.cpu.max.dev'
}
}
},
cpuallocated: {
label: 'label.cpu.allocated',
label: 'label.metrics.cpu.allocated',
collapsible: true,
columns: {
cpuallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -315,16 +315,16 @@
}
},
cputotal: {
label: 'label.cpu.total.ghz'
label: 'label.metrics.cpu.total.ghz'
}
}
},
memused: {
label: 'label.memory.usage',
label: 'label.metrics.memory.usage',
collapsible: true,
columns: {
memusedavg: {
label: 'label.memory.used.avg',
label: 'label.metrics.memory.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -332,16 +332,16 @@
}
},
memmaxdev: {
label: 'label.memory.max.dev'
label: 'label.metrics.memory.max.dev'
}
}
},
memallocated: {
label: 'label.memory.allocated',
label: 'label.metrics.memory.allocated',
collapsible: true,
columns: {
memallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -349,7 +349,7 @@
}
},
memtotal: {
label: 'label.memory.total.gb'
label: 'label.metrics.memory.total.gb'
}
}
}
@ -516,10 +516,10 @@
id: 'hosts',
fields: {
name: {
label: 'label.name'
label: 'label.metrics.name'
},
state: {
label: 'label.state',
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
@ -534,17 +534,17 @@
}
},
cpuused: {
label: 'label.cpu.usage',
label: 'label.metrics.cpu.usage',
collapsible: true,
columns: {
cores: {
label: 'label.num.cpu.cores',
label: 'label.metrics.num.cpu.cores',
},
cputotal: {
label: 'label.cpu.total.ghz'
label: 'label.metrics.cpu.total.ghz'
},
cpuusedavg: {
label: 'label.cpu.used.avg',
label: 'label.metrics.cpu.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -552,7 +552,7 @@
}
},
cpuallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'cpunotificationthreshold',
@ -562,14 +562,14 @@
}
},
memused: {
label: 'label.memory.usage',
label: 'label.metrics.memory.usage',
collapsible: true,
columns: {
memtotal: {
label: 'label.memory.total.gb'
label: 'label.metrics.memory.total.gb'
},
memallocated: {
label: 'label.allocated',
label: 'label.metrics.allocated',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -577,7 +577,7 @@
}
},
memusedavg: {
label: 'label.memory.used.avg',
label: 'label.metrics.memory.used.avg',
thresholdcolor: true,
thresholds: {
notification: 'memnotificationthreshold',
@ -587,14 +587,14 @@
}
},
network: {
label: 'label.network',
label: 'label.metrics.network.usage',
collapsible: true,
columns: {
networkread: {
label: 'label.network.read'
label: 'label.metrics.network.read'
},
networkwrite: {
label: 'label.network.write'
label: 'label.metrics.network.write'
}
}
}
@ -696,10 +696,10 @@
id: 'instances',
fields: {
name: {
label: 'label.name'
label: 'label.metrics.name'
},
state: {
label: 'label.state',
label: 'label.metrics.state',
converter: function (str) {
// For localization
return str;
@ -712,56 +712,56 @@
}
},
cpuused: {
label: 'label.cpu.usage',
label: 'label.metrics.cpu.usage',
collapsible: true,
columns: {
cores: {
label: 'label.num.cpu.cores',
label: 'label.metrics.num.cpu.cores',
},
cputotal: {
label: 'label.cpu.total.ghz'
label: 'label.metrics.cpu.total.ghz'
},
cpuused: {
label: 'label.cpu.used.avg',
label: 'label.metrics.cpu.used.avg',
}
}
},
memused: {
label: 'label.memory.usage',
label: 'label.metrics.memory.usage',
collapsible: true,
columns: {
memallocated: {
label: 'label.allocated'
label: 'label.metrics.allocated'
},
memused: {
label: 'label.memory.used.avg'
label: 'label.metrics.memory.used.avg'
}
}
},
network: {
label: 'label.network',
label: 'label.metrics.network.usage',
collapsible: true,
columns: {
networkread: {
label: 'label.network.read'
label: 'label.metrics.network.read'
},
networkwrite: {
label: 'label.network.write'
label: 'label.metrics.network.write'
}
}
},
disk: {
label: 'label.disk.volume',
label: 'label.metrics.disk.usage',
collapsible: true,
columns: {
diskread: {
label: 'label.disk.read.bytes'
label: 'label.metrics.disk.read.bytes'
},
diskwrite: {
label: 'label.disk.write.bytes'
label: 'label.metrics.disk.write.bytes'
},
diskiops: {
label: 'label.disk.iops.total'
label: 'label.metrics.disk.iops.total'
}
}
}