flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/7] flink git commit: [FLINK-3056] [web-dashboard] Represent bytes in more readable form.
Date Mon, 30 Nov 2015 18:20:57 GMT
Repository: flink
Updated Branches:
  refs/heads/master 2b358cde0 -> d5a6b13ab


http://git-wip-us.apache.org/repos/asf/flink/blob/80512229/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
index daba67d..4d05cc3 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
@@ -38,9 +38,9 @@ limitations under the License.
       <td><span ng-if="v['end-time'] &gt; -1">{{ v['end-time'] | amDateFormat:'YYYY-MM-DD,
H:mm:ss' }}</span></td>
       <td><span ng-if="v.duration &gt; -1" title="{{v.duration | humanizeDuration:false}}">{{v.duration
| humanizeDuration:true}}</span></td>
       <td class="td-long">{{ v.name | humanizeText }}</td>
-      <td>{{ v.metrics['read-bytes'] | number }}</td>
+      <td title="{{v.metrics['read-bytes']}} bytes">{{ v.metrics['read-bytes'] | humanizeBytes
}}</td>
       <td>{{ v.metrics['read-records'] | number }}</td>
-      <td>{{ v.metrics['write-bytes'] | number }}</td>
+      <td title="{{v.metrics['write-bytes']}} bytes">{{ v.metrics['write-bytes'] |
humanizeBytes }}</td>
       <td>{{ v.metrics['write-records'] | number }}</td>
       <td>
         <div class="label-group">

http://git-wip-us.apache.org/repos/asf/flink/blob/80512229/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
index 147b14d..874ed88 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
@@ -38,9 +38,9 @@ limitations under the License.
       <td><span ng-if="subtask['start-time'] &gt; -1">{{ subtask['start-time']
| amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
       <td><span ng-if="subtask['end-time'] &gt; -1">{{ subtask['end-time']
| amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
       <td><span ng-if="subtask.duration &gt; -1" title="{{subtask.duration |
humanizeDuration:false}}">{{subtask.duration | humanizeDuration:true}}</span></td>
-      <td><span ng-if="subtask.metrics['read-bytes'] &gt; -1">{{ subtask.metrics['read-bytes']
| number }}</span></td>
+      <td><span ng-if="subtask.metrics['read-bytes'] &gt; -1" title="{{subtask.metrics['read-bytes']}}
bytes">{{ subtask.metrics['read-bytes'] | humanizeBytes}}</span></td>
       <td><span ng-if="subtask.metrics['read-records'] &gt; -1">{{ subtask.metrics['read-records']
| number }}</span></td>
-      <td><span ng-if="subtask.metrics['write-bytes'] &gt; -1">{{ subtask.metrics['write-bytes']
| number }}</span></td>
+      <td><span ng-if="subtask.metrics['write-bytes'] &gt; -1" title="{{subtask.metrics['write-bytes']}}
bytes">{{ subtask.metrics['write-bytes'] | humanizeBytes}}</span></td>
       <td><span ng-if="subtask.metrics['write-records'] &gt; -1">{{ subtask.metrics['write-records']
| number }}</span></td>
       <td>{{ subtask.attempt + 1 }}</td>
       <td>{{ subtask.host }}</td>

http://git-wip-us.apache.org/repos/asf/flink/blob/80512229/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
index bf37409..f56dcbe 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
@@ -48,9 +48,9 @@ limitations under the License.
         <td>{{ manager.slotsNumber }}</td>
         <td>{{ manager.freeSlots }}</td>
         <td>{{ manager.cpuCores }}</td>
-        <td>{{ manager.physicalMemory | bytes:MB }}</td>
-        <td>{{ manager.freeMemory | bytes:MB }}</td>
-        <td>{{ manager.managedMemory | bytes:MB }}</td>
+        <td title="{{manager.physicalMemory}} bytes">{{ manager.physicalMemory | humanizeBytes
}}</td>
+        <td title="{{manager.freeMemory}} bytes">{{ manager.freeMemory | humanizeBytes
}}</td>
+        <td title="{{manager.managedMemory}} bytes">{{ manager.managedMemory | humanizeBytes
}}</td>
       </tr>
     </tbody>
   </table>

http://git-wip-us.apache.org/repos/asf/flink/blob/80512229/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 2a8b51e..691490e 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
@@ -30,21 +30,21 @@ limitations under the License.
   <tbody>
     <tr>
       <td>Heap</td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.heap.committed'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.heap.init'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.heap.max'].value
| bytes:MB"></td>
+      <td title="{{metrics.metrics.gauges['memory.heap.committed'].value}} bytes">{{metrics.metrics.gauges['memory.heap.committed'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.heap.init'].value}} bytes">{{metrics.metrics.gauges['memory.heap.init'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.heap.max'].value}} bytes">{{metrics.metrics.gauges['memory.heap.max'].value
| humanizeBytes}}</td>
     </tr>
     <tr>
       <td>Non-Heap</td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.non-heap.committed'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.non-heap.init'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.non-heap.max'].value
| bytes:MB"></td>
+      <td title="{{metrics.metrics.gauges['memory.non-heap.committed'].value}} bytes">{{metrics.metrics.gauges['memory.non-heap.committed'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.non-heap.init'].value}} bytes">{{metrics.metrics.gauges['memory.non-heap.init'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.non-heap.max'].value}} bytes">{{metrics.metrics.gauges['memory.non-heap.max'].value
| humanizeBytes}}</td>
     </tr>
     <tr>
       <td>Total</td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.total.committed'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.total.init'].value
| bytes:MB"></td>
-      <td table-property="table-property" value="metrics.metrics.gauges['memory.total.max'].value
| bytes:MB"></td>
+      <td title="{{metrics.metrics.gauges['memory.total.committed'].value}} bytes">{{metrics.metrics.gauges['memory.total.committed'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.total.init'].value}} bytes">{{metrics.metrics.gauges['memory.total.init'].value
| humanizeBytes}}</td>
+      <td title="{{metrics.metrics.gauges['memory.total.max'].value}} bytes">{{metrics.metrics.gauges['memory.total.max'].value
| humanizeBytes}}</td>
     </tr>
   </tbody>
 </table>
@@ -66,9 +66,9 @@ limitations under the License.
       <td>{{ metrics.slotsNumber }}</td>
       <td>{{ metrics.freeSlots }}</td>
       <td>{{ metrics.cpuCores }}</td>
-      <td>{{ metrics.physicalMemory | bytes:MB }}</td>
-      <td>{{ metrics.freeMemory | bytes:MB }}</td>
-      <td>{{ metrics.managedMemory | bytes:MB }}</td>
+      <td title="{{metrics.physicalMemory}} bytes">{{ metrics.physicalMemory | humanizeBytes
}}</td>
+      <td title="{{metrics.freeMemory}} bytes">{{ metrics.freeMemory | humanizeBytes
}}</td>
+      <td title="{{metrics.managedMemory}} bytes">{{ metrics.managedMemory | humanizeBytes
}}</td>
     </tr>
   </tbody>
 </table>


Mime
View raw message