From f59cc12e63f0cf1379c8ae4f61c8e65c12d025e9 Mon Sep 17 00:00:00 2001 From: vinoyang Date: Sun, 7 May 2017 15:31:14 +0800 Subject: [PATCH 1/4] [FLINK-6448] Web UI TaskManager view: Rename 'Free Memory' to 'JVM Heap' --- .../web-dashboard/app/partials/taskmanager/index.jade | 2 +- .../app/partials/taskmanager/taskmanager.metrics.jade | 4 ++-- .../web-dashboard/web/partials/taskmanager/index.html | 4 ++-- .../web/partials/taskmanager/taskmanager.metrics.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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 a2b715d125b72..3251fb425d0bc 100644 --- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade +++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade @@ -33,7 +33,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main th Free Slots th CPU Cores th Physical Memory - th Free Memory + th JVM Heap Size th Flink Managed Memory tbody 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 e348a5beb46cd..4af1261995d95 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 @@ -25,7 +25,7 @@ div(ng-if="metrics.id") th Free Slots th CPU Cores th Physical Memory - th Free Memory + th JVM Heap Size th Flink Managed Memory tbody tr @@ -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 }} 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 f56dcbe3f5e19..688478d9cdeab 100644 --- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html +++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html @@ -32,7 +32,7 @@ Free Slots CPU Cores Physical Memory - Free Memory + JVM Heap Size Flink Managed Memory @@ -54,4 +54,4 @@ - \ No newline at end of file + 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 3372db803d1ed..3031d4ad9127a 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 @@ -27,7 +27,7 @@

Overview

Free Slots CPU Cores Physical Memory - Free Memory + JVM Heap Size Flink Managed Memory @@ -137,4 +137,4 @@

Garbage Collection

- \ No newline at end of file + From 4ac392450c84ba12dd6fbabd995a3fe5aefde462 Mon Sep 17 00:00:00 2001 From: vinoyang Date: Sun, 7 May 2017 15:44:58 +0800 Subject: [PATCH 2/4] [FLINK-6451] Web UI: Rename 'Metrics' view to 'Task Metrics' --- .../web-dashboard/app/partials/jobs/job.plan.jade | 2 +- .../web-dashboard/web/partials/jobs/job.plan.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade index 6c4cf0be0840d..4d5ea4740dbb9 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade @@ -31,7 +31,7 @@ split a(ui-sref=".taskmanagers({nodeid: nodeid})") TaskManagers li(ui-sref-active='active') - a(ui-sref=".metrics({nodeid: nodeid})") Metrics + a(ui-sref=".metrics({nodeid: nodeid})") Task Metrics li(ui-sref-active='active') a(ui-sref=".watermarks({nodeid: nodeid})") Watermarks diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html index c52d67ffba5a7..db7db02350766 100644 --- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html @@ -29,7 +29,7 @@