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

metrics: add labels for cluster metrics view 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-09-23 11:11:07 +05:30
parent 4a130be174
commit 2fddb9fde5
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,6 +485,10 @@ 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
@ -791,6 +795,10 @@ 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=Memory Max Deviation
label.memory.total.gb=Total Memory (GB)
label.menu.accounts=Accounts
label.menu.alerts=Alerts
label.menu.all.accounts=All Accounts

8
ui/dictionary.jsp
View File

@ -500,6 +500,10 @@ 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" />',
@ -792,6 +796,10 @@ 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" />',

14
ui/scripts/metrics.js
View File

@ -55,7 +55,7 @@
label: 'label.hosts'
},
cpuused: {
label: 'label.cpu.used',
label: 'label.cpu.usage',
collapsible: true,
columns: {
cpuusedavg: {
@ -74,31 +74,31 @@
label: 'label.allocated'
},
cputotal: {
label: 'label.cpu.total'
label: 'label.cpu.total.ghz'
}
}
},
memused: {
label: 'label.mem.used',
label: 'label.memory.usage',
collapsible: true,
columns: {
memusedavg: {
label: 'label.mem.used.avg'
label: 'label.memory.used.avg'
},
memmaxdev: {
label: 'label.mem.max.dev'
label: 'label.memory.max.dev'
}
}
},
memallocated: {
label: 'label.mem.allocated',
label: 'label.memory.allocated',
collapsible: true,
columns: {
memallocated: {
label: 'label.allocated'
},
memtotal: {
label: 'label.mem.total'
label: 'label.memory.total.gb'
}
}
}