You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/07 14:08:08 UTC
[10/30] flink git commit: [FLINK-7648] [flip6] Write
HardwareDescription in sub object of legacy.TaskManagersHandler
[FLINK-7648] [flip6] Write HardwareDescription in sub object of legacy.TaskManagersHandler
This closes #4824.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ac5f5b55
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ac5f5b55
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ac5f5b55
Branch: refs/heads/master
Commit: ac5f5b551ab560261a50065b23022255201734b8
Parents: def8781
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Oct 13 16:32:56 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Nov 7 15:07:42 2017 +0100
----------------------------------------------------------------------
.../web-dashboard/app/partials/taskmanager/index.jade | 8 ++++----
.../app/partials/taskmanager/taskmanager.metrics.jade | 10 +++++-----
flink-runtime-web/web-dashboard/web/js/hs/index.js | 4 ++--
flink-runtime-web/web-dashboard/web/js/index.js | 4 ++--
.../web/partials/jobs/job.plan.node.taskmanagers.html | 2 +-
.../web-dashboard/web/partials/taskmanager/index.html | 8 ++++----
.../web/partials/taskmanager/taskmanager.metrics.html | 8 ++++----
.../flink/runtime/dispatcher/DispatcherRestEndpoint.java | 4 ++--
.../runtime/rest/handler/legacy/TaskManagersHandler.java | 4 ++++
9 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
index 3251fb4..a938fe6 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
@@ -46,8 +46,8 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main
td {{ manager.timeSinceLastHeartbeat | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
td {{ manager.slotsNumber }}
td {{ manager.freeSlots }}
- td {{ manager.cpuCores }}
- td(title="{{manager.physicalMemory}} bytes") {{ manager.physicalMemory | humanizeBytes }}
- td(title="{{manager.freeMemory}} bytes") {{ manager.freeMemory | humanizeBytes }}
- td(title="{{manager.managedMemory}} bytes") {{ manager.managedMemory | humanizeBytes }}
+ td {{ manager.hardware.cpuCores }}
+ td(title="{{manager.hardware.physicalMemory}} bytes") {{ manager.hardware.physicalMemory | humanizeBytes }}
+ td(title="{{manager.hardware.freeMemory}} bytes") {{ manager.hardware.freeMemory | humanizeBytes }}
+ td(title="{{manager.hardware.managedMemory}} bytes") {{ manager.hardware.managedMemory | humanizeBytes }}
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/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 fbf170d..290b524 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
@@ -32,10 +32,10 @@ div(ng-if="metrics.id")
td {{ metrics.dataPort }}
td {{ metrics.slotsNumber }}
td {{ metrics.freeSlots }}
- td {{ metrics.cpuCores }}
- td {{ metrics.physicalMemory | humanizeBytes }}
- td {{ metrics.freeMemory | humanizeBytes }}
- td {{ metrics.managedMemory | humanizeBytes }}
+ td {{ metrics.hardware.cpuCores }}
+ td {{ metrics.hardware.physicalMemory | humanizeBytes }}
+ td {{ metrics.hardware.freeMemory | humanizeBytes }}
+ td {{ metrics.hardware.managedMemory | humanizeBytes }}
h1 Memory
@@ -111,4 +111,4 @@ div(ng-if="metrics.id")
tr
td {{ g.name }}
td {{ g.count | toLocaleString }}
- td {{ g.time | toLocaleString }}
\ No newline at end of file
+ td {{ g.time | toLocaleString }}