From b1c35af8c2a209a2c2539ab96d915f28ae9e38c7 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <aprateek@apache.org>
Date: Thu, 30 Mar 2017 09:40:18 +0530
Subject: [PATCH] FR17: Metrics fix

---
 .../src/com/cloud/api/query/ViewResponseHelper.java  |  2 +-
 server/src/com/cloud/test/DatabaseConfig.java        |  2 +-
 ui/scripts/metrics.js                                | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java
index ae3437f7cf6..ba48e39bdc7 100644
--- a/server/src/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/com/cloud/api/query/ViewResponseHelper.java
@@ -290,7 +290,7 @@ public class ViewResponseHelper {
                 if (vs != null){
                     long vsz = vs.getVirtualSize();
                     long psz = vs.getPhysicalSize() ;
-                    double util = (int)(psz/vsz);
+                    double util = (double)psz/vsz;
                     vrData.setVirtualsize(vsz);
                     vrData.setPhysicalsize(psz);
                     vrData.setUtilization(df.format(util));
diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index 1c9b0db761c..7ecfed07aa4 100755
--- a/server/src/com/cloud/test/DatabaseConfig.java
+++ b/server/src/com/cloud/test/DatabaseConfig.java
@@ -319,7 +319,7 @@ public class DatabaseConfig {
 
         s_defaultConfigurationValues.put("host.stats.interval", "60000");
         s_defaultConfigurationValues.put("storage.stats.interval", "60000");
-        //s_defaultConfigurationValues.put("volume.stats.interval", "-1");
+        s_defaultConfigurationValues.put("volume.stats.interval", "60000");
         s_defaultConfigurationValues.put("port", "8250");
         s_defaultConfigurationValues.put("integration.api.port", "8096");
         s_defaultConfigurationValues.put("usage.stats.job.exec.time", "00:15"); // run at 12:15am
diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js
index 5b013afff1b..afd413a4294 100644
--- a/ui/scripts/metrics.js
+++ b/ui/scripts/metrics.js
@@ -577,6 +577,18 @@
                 sizegb: {
                     label: 'label.metrics.disk.size'
                 },
+                physicalsize: {
+                    label: 'label.disk.physicalsize',
+                    converter: function(args) {
+                        if (args == null || args == 0)
+                            return "";
+                        else
+                            return cloudStack.converters.convertBytes(args);
+                    }
+                },
+                utilization: {
+                    label: 'label.disk.utilisation'
+                },
                 storagetype: {
                     label: 'label.metrics.disk.storagetype'
                 },