flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [1/2] flink git commit: [FLINK-2943][web-dashboard] Rename bytes/records read/written to received/sent. [hotfix][web-dashboard] Fix taskmanager charts legend.
Date Wed, 04 Nov 2015 11:42:47 GMT
Repository: flink
Updated Branches:
  refs/heads/release-0.10 f1bf28237 -> 81f8c05d5


[FLINK-2943][web-dashboard] Rename bytes/records read/written to received/sent.
[hotfix][web-dashboard] Fix taskmanager charts legend.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9bd27cad
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9bd27cad
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9bd27cad

Branch: refs/heads/release-0.10
Commit: 9bd27cadb233743a5c7a9df974d6b3d0d84ea54e
Parents: f1bf282
Author: Sachin Goel <sachingoel0101@gmail.com>
Authored: Tue Nov 3 19:22:03 2015 +0530
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Wed Nov 4 12:41:10 2015 +0100

----------------------------------------------------------------------
 .../jobs/job.plan.node-list.overview.jade        |  8 ++++----
 .../partials/jobs/job.plan.node.subtasks.jade    |  8 ++++----
 .../taskmanager/taskmanager.metrics.jade         | 19 ++++++++++---------
 .../web-dashboard/app/styles/index.styl          |  4 ++++
 .../web-dashboard/web/css/index.css              |  4 ++++
 .../jobs/job.plan.node-list.overview.html        |  8 ++++----
 .../partials/jobs/job.plan.node.subtasks.html    |  8 ++++----
 .../taskmanager/taskmanager.metrics.html         |  2 +-
 8 files changed, 35 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node-list.overview.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node-list.overview.jade
b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node-list.overview.jade
index 5145bf9..b0f0a3f 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node-list.overview.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node-list.overview.jade
@@ -22,10 +22,10 @@ table.table.table-body-hover.table-clickable.table-activable
       th End Time
       th Duration
       th Name
-      th Bytes read
-      th Records read
-      th Bytes written
-      th Records written
+      th Bytes received
+      th Records received
+      th Bytes sent
+      th Records sent
       th Tasks
       th Status
 

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.subtasks.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.subtasks.jade
b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.subtasks.jade
index 9cfed06..bfe887d 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.subtasks.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.subtasks.jade
@@ -25,10 +25,10 @@ table.table.table-hover.table-clickable.table-activable.table-inner(ng-if="subta
       th Start Time
       th End Time
       th Duration
-      th Bytes read
-      th Records read
-      th Bytes written
-      th Records written
+      th Bytes received
+      th Records received
+      th Bytes sent
+      th Records sent
       th Attempt
       th Host
       th Status

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
index cc3c555..7eff6aa 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
@@ -28,15 +28,16 @@ table.table(ng-if="metrics.id")
       td
         livechart(data="metrics" key="used")
         .row.text-center
-          span
-            i.fa.fa-square-o.fa-lg(id="total-mem")
-            | &nbsp;Total Memory&nbsp;
-          span
-            i.fa.fa-square-o.fa-lg(id="heap-mem")
-            | &nbsp;Heap Memory&nbsp;
-          span
-            i.fa.fa-square-o.fa-lg(id="non-heap-mem")
-            | &nbsp;Non-heap Memory&nbsp;
+          span.label.legend-box#total-mem
+            | &nbsp;&nbsp;
+          | &nbsp;Total Memory&nbsp;&nbsp;
+          span.label.legend-box#heap-mem
+            | &nbsp;&nbsp;
+          | &nbsp;Heap Memory&nbsp;&nbsp;
+          span.label.legend-box#non-heap-mem
+            | &nbsp;&nbsp;
+          | &nbsp;Non-heap Memory&nbsp;&nbsp;
+
 
 table.table.table-properties(ng-if="metrics.id")
   thead

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/flink-runtime-web/web-dashboard/app/styles/index.styl
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/styles/index.styl b/flink-runtime-web/web-dashboard/app/styles/index.styl
index 7d97efc..b800165 100644
--- a/flink-runtime-web/web-dashboard/app/styles/index.styl
+++ b/flink-runtime-web/web-dashboard/app/styles/index.styl
@@ -411,6 +411,10 @@ livechart
     td.td-long
       width: 30%
 
+.legend-box
+  font-size: 10px
+  width: 2em
+
 #total-mem
   background-color: #7cb5ec
 

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/flink-runtime-web/web-dashboard/web/css/index.css
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/css/index.css b/flink-runtime-web/web-dashboard/web/css/index.css
index 101f4cb..5bf0a6e 100644
--- a/flink-runtime-web/web-dashboard/web/css/index.css
+++ b/flink-runtime-web/web-dashboard/web/css/index.css
@@ -582,6 +582,10 @@ svg.graph .node-label {
     width: 30%;
   }
 }
+.legend-box {
+  font-size: 10px;
+  width: 2em;
+}
 #total-mem {
   background-color: #7cb5ec;
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/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 1706d3e..5545b8b 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
@@ -24,10 +24,10 @@ limitations under the License.
       <th>End Time</th>
       <th>Duration</th>
       <th>Name</th>
-      <th>Bytes read</th>
-      <th>Records read</th>
-      <th>Bytes written</th>
-      <th>Records written</th>
+      <th>Bytes received</th>
+      <th>Records received</th>
+      <th>Bytes sent</th>
+      <th>Records sent</th>
       <th>Tasks</th>
       <th>Status</th>
     </tr>

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/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 40b16bc..3a06aed 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
@@ -24,10 +24,10 @@ limitations under the License.
       <th>Start Time</th>
       <th>End Time</th>
       <th>Duration</th>
-      <th>Bytes read</th>
-      <th>Records read</th>
-      <th>Bytes written</th>
-      <th>Records written</th>
+      <th>Bytes received</th>
+      <th>Records received</th>
+      <th>Bytes sent</th>
+      <th>Records sent</th>
       <th>Attempt</th>
       <th>Host</th>
       <th>Status</th>

http://git-wip-us.apache.org/repos/asf/flink/blob/9bd27cad/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 acf4b89..db760c8 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
@@ -31,7 +31,7 @@ limitations under the License.
       </td>
       <td>
         <livechart data="metrics" key="used"></livechart>
-        <div class="row text-center"><span><i id="total-mem" class="fa fa-square-o
fa-lg"></i>&nbsp;Total Memory&nbsp;</span><span><i id="heap-mem"
class="fa fa-square-o fa-lg"></i>&nbsp;Heap Memory&nbsp;</span><span><i
id="non-heap-mem" class="fa fa-square-o fa-lg"></i>&nbsp;Non-heap Memory&nbsp;</span></div>
+        <div class="row text-center"><span id="total-mem" class="label legend-box">&nbsp;&nbsp;</span>&nbsp;Total
Memory&nbsp;&nbsp;<span id="heap-mem" class="label legend-box">&nbsp;&nbsp;</span>&nbsp;Heap
Memory&nbsp;&nbsp;<span id="non-heap-mem" class="label legend-box">&nbsp;&nbsp;</span>&nbsp;Non-heap
Memory&nbsp;&nbsp;</div>
       </td>
     </tr>
   </tbody>


Mime
View raw message