You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/11/12 09:47:48 UTC
svn commit: r1540972 -
/incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm
Author: rmannibucau
Date: Tue Nov 12 08:47:47 2013
New Revision: 1540972
URL: http://svn.apache.org/r1540972
Log:
putting non heap mem on the same line as heap mem and cpu + fixing vertical axis unit
Modified:
incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm
Modified: incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm?rev=1540972&r1=1540971&r2=1540972&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm (original)
+++ incubator/sirona/trunk/server/reporting/src/main/resources/templates/jvm/jvm.vm Tue Nov 12 08:47:47 2013
@@ -16,7 +16,7 @@
*#
<div class="container-fluid">
<div class="row-fluid">
- <div class="col-lg-6">
+ <div class="col-lg-4">
#graphBlock("CPU", "cpu")
#if ($name)
@@ -39,7 +39,7 @@
</div>
#end
</div>
- <div class="col-lg-6">
+ <div class="col-lg-4">
#graphBlock("Used Memory", "memory")
#if ($initMemory)
@@ -61,7 +61,7 @@
#end
</div>
- <div class="col-lg-6">
+ <div class="col-lg-4">
#graphBlock("Used Non Heap Memory", "nonheapmemory")
#if ($initMemory)
@@ -112,22 +112,21 @@
{
min: 0,
tickFormatter: function (bytes, axis) {
- var precision = 2;
var kb = 1024;
var mb = kb * kb;
var gb = mb * kb;
if (bytes >= 0 && bytes < kb) {
- return bytes + ' o';
+ return bytes.toFixed(axis.tickDecimals) + ' o';
} else if (bytes >= kb && bytes < mb) {
- return (bytes / kb).toFixed(precision) + ' Ko';
+ return (bytes / kb).toFixed(axis.tickDecimals) + ' Ko';
} else if (bytes >= mb && bytes < gb) {
- return (bytes / mb).toFixed(precision) + ' Mo';
+ return (bytes / mb).toFixed(axis.tickDecimals) + ' Mo';
} else if (bytes >= gb) {
- return (bytes / gb).toFixed(precision) + ' Go';
+ return (bytes / gb).toFixed(axis.tickDecimals) + ' Go';
}
- return bytes + ' B';
+ return bytes.toFixed(axis.tickDecimals) + ' B';
}
}
]