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

Merge pull request #33 from shapeblue/fr17 

FR17: type conversion fix
This commit is contained in:
Abhinandan Prateek 2017-03-30 12:40:49 +05:30 committed by GitHub
parent 9b181dbf19 b1c35af8c2
commit 8f7428837e
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/query/ViewResponseHelper.java
View File

@ -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));

2
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -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

12
ui/scripts/metrics.js
View File

@ -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'
},