Repository: flink Updated Branches: refs/heads/master 45b770b51 -> 4e336c692
http://git-wip-us.apache.org/repos/asf/flink/blob/4e336c69/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html index 43687cd..53aaa75 100644 --- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html +++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html @@ -57,21 +57,21 @@ limitations under the License. <tbody> <tr> <td>Heap</td> - <td>{{ metrics.metrics.heapCommitted | humanizeBytes }}</td> - <td>{{ metrics.metrics.heapUsed | humanizeBytes }}</td> - <td>{{ metrics.metrics.heapMax | humanizeBytes }}</td> + <td>{{ metrics.metrics.heapCommitted | humanizeBytes }}</td> + <td>{{ metrics.metrics.heapUsed | humanizeBytes }}</td> + <td>{{ metrics.metrics.heapMax | humanizeBytes }}</td> </tr> <tr> <td>Non-Heap</td> - <td>{{ metrics.metrics.nonHeapCommitted | humanizeBytes }}</td> - <td>{{ metrics.metrics.nonHeapUsed | humanizeBytes }}</td> - <td>{{ metrics.metrics.nonHeapMax | humanizeBytes }}</td> + <td>{{ metrics.metrics.nonHeapCommitted | humanizeBytes }}</td> + <td>{{ metrics.metrics.nonHeapUsed | humanizeBytes }}</td> + <td>{{ metrics.metrics.nonHeapMax | humanizeBytes }}</td> </tr> <tr> <td>Total</td> - <td>{{ metrics.metrics.totalCommitted | humanizeBytes }}</td> - <td>{{ metrics.metrics.totalUsed | humanizeBytes }}</td> - <td>{{ metrics.metrics.totalMax | humanizeBytes }}</td> + <td>{{ metrics.metrics.totalCommitted | humanizeBytes }}</td> + <td>{{ metrics.metrics.totalUsed | humanizeBytes }}</td> + <td>{{ metrics.metrics.totalMax | humanizeBytes }}</td> </tr> </tbody> </table> @@ -88,20 +88,20 @@ limitations under the License. <tbody> <tr> <td>Direct</td> - <td>{{ metrics.metrics.directCount }}</td> - <td>{{ metrics.metrics.directUsed }}</td> - <td>{{ metrics.metrics.directTotal }}</td> + <td>{{ metrics.metrics.directCount | toLocaleString }}</td> + <td>{{ metrics.metrics.directUsed | humanizeBytes }}</td> + <td>{{ metrics.metrics.directMax | humanizeBytes }}</td> </tr> <tr> <td>Mapped</td> - <td>{{ metrics.metrics.mappedCount }}</td> - <td>{{ metrics.metrics.mappedUsed }}</td> - <td>{{ metrics.metrics.mappedMax }}</td> + <td>{{ metrics.metrics.mappedCount | toLocaleString }}</td> + <td>{{ metrics.metrics.mappedUsed | humanizeBytes }}</td> + <td>{{ metrics.metrics.mappedMax | humanizeBytes }}</td> </tr> </tbody> </table> <h1>Network</h1> - <h2>MemorySegments</h2> + <h2>Memory Segments</h2> <table class="table table-properties"> <thead> <tr> @@ -112,11 +112,11 @@ limitations under the License. <tbody> <tr> <td>Available</td> - <td>{{ metrics.metrics.memorySegmentsAvailable }}</td> + <td>{{ metrics.metrics.memorySegmentsAvailable | toLocaleString }}</td> </tr> <tr> <td>Total</td> - <td>{{ metrics.metrics.memorySegmentsTotal }}</td> + <td>{{ metrics.metrics.memorySegmentsTotal | toLocaleString }}</td> </tr> </tbody> </table> @@ -130,10 +130,10 @@ limitations under the License. </tr> </thead> <tbody ng-repeat="g in metrics.metrics.garbageCollectors"> - <tr> + <tr> <td>{{ g.name }}</td> - <td>{{ g.count }}</td> - <td>{{ g.time }}</td> + <td>{{ g.count | toLocaleString }}</td> + <td>{{ g.time | toLocaleString }}</td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/flink/blob/4e336c69/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java index 64d06ce..a10dc3b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java @@ -17,6 +17,7 @@ */ package org.apache.flink.runtime.metrics.util; +import org.apache.commons.lang3.text.WordUtils; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.io.network.NetworkEnvironment; @@ -46,13 +47,16 @@ public class MetricUtils { final NetworkEnvironment network) { MetricGroup status = metrics.addGroup(METRIC_GROUP_STATUS_NAME); - status.gauge("TotalMemorySegments", new Gauge<Integer>() { + MetricGroup networkGroup = status + .addGroup("Network"); + + networkGroup.gauge("TotalMemorySegments", new Gauge<Integer>() { @Override public Integer getValue() { return network.getNetworkBufferPool().getTotalNumberOfMemorySegments(); } }); - status.gauge("AvailableMemorySegments", new Gauge<Integer>() { + networkGroup.gauge("AvailableMemorySegments", new Gauge<Integer>() { @Override public Integer getValue() { return network.getNetworkBufferPool().getNumberOfAvailableMemorySegments(); @@ -157,7 +161,7 @@ public class MetricUtils { List<BufferPoolMXBean> bufferMxBeans = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class); for (final BufferPoolMXBean bufferMxBean : bufferMxBeans) { - MetricGroup bufferGroup = metrics.addGroup(bufferMxBean.getName()); + MetricGroup bufferGroup = metrics.addGroup(WordUtils.capitalize(bufferMxBean.getName())); bufferGroup.gauge("Count", new Gauge<Long>() { @Override public Long getValue() {
