From 2b4707da7087b8d4b5dfbc465f46b6f46f7052c0 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 30 Oct 2015 13:44:26 +0530 Subject: [PATCH] metrics: show service offering name in case of root disks Signed-off-by: Rohit Yadav --- client/WEB-INF/classes/resources/messages.properties | 2 +- ui/scripts/metrics.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index a5c0b6fa477..d742a0ab6f6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -841,7 +841,7 @@ label.metrics.cpu.usage=CPU Usage label.metrics.cpu.used.avg=Used label.metrics.disk=Disk label.metrics.disk.iops.total=IOPS Total -label.metrics.disk.offering=Disk Offering +label.metrics.disk.offering=Offering label.metrics.disk.read=Read label.metrics.disk.size=Size label.metrics.disk.storagetype=Type diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js index f43cb65b6be..1ac80fa6c5c 100644 --- a/ui/scripts/metrics.js +++ b/ui/scripts/metrics.js @@ -921,6 +921,9 @@ items[idx].state = volume.state; items[idx].vmname = volume.vmname; items[idx].diskoffering = volume.diskofferingname; + if (volume.type == 'ROOT') { + items[idx].diskoffering = volume.serviceofferingname; + } items[idx].disksize = parseFloat(volume.size)/(1024.0*1024.0*1024.0) + ' GB'; items[idx].storagetype = volume.storagetype.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}) + ' (' + volume.type + ')'; if (volume.storage) {