You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/12/28 11:43:49 UTC

[flink] branch master updated: [FLINK-20259][web] Add explanation to Effective Configuration in JM/TM

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new a914581  [FLINK-20259][web] Add explanation to Effective Configuration in JM/TM
a914581 is described below

commit a9145813db564ef669a3c0c816a380b65890efaf
Author: vthinkxie <ya...@alibaba-inc.com>
AuthorDate: Mon Dec 21 10:06:56 2020 +0800

    [FLINK-20259][web] Add explanation to Effective Configuration in JM/TM
---
 .../pages/job-manager/metrics/job-manager-metrics.component.html    | 5 ++++-
 .../pages/job-manager/metrics/job-manager-metrics.component.less    | 6 ++++++
 .../pages/task-manager/metrics/task-manager-metrics.component.html  | 4 +++-
 .../pages/task-manager/metrics/task-manager-metrics.component.less  | 5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.html
index 48f69bc..501aa1e 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.html
+++ b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.html
@@ -21,7 +21,10 @@
     <thead>
       <tr>
         <th colspan="2" class="table-header">Flink Memory Model</th>
-        <th class="table-header">Configured Values</th>
+        <th class="table-header">
+          Effective Configuration
+          <i class="header-icon" nz-icon nz-tooltip nzTitle="This column shows the values that are actually used by Flink. These may differ from the configured values; Flink may adjust them to fit the actual setup, and automatically derives values that were not explicitly configured." nzType="info-circle"></i>
+        </th>
         <th class="table-header">Metric</th>
       </tr>
     </thead>
diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.less b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.less
index 89a76c9..4482f93 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.less
+++ b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.less
@@ -21,6 +21,12 @@
 .wrapper {
   margin: 24px;
 }
+
+.header-icon {
+  position: relative;
+  top: 1px;
+}
+
 .flink-memory-model {
   margin-bottom: 24px;
   ::ng-deep {
diff --git a/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.html b/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.html
index 05004eb..12d0429 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.html
+++ b/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.html
@@ -22,7 +22,9 @@
       <thead>
       <tr>
         <th colspan="2" class="table-header">Flink Memory Model</th>
-        <th class="table-header">Configured Values</th>
+        <th class="table-header">Effective Configuration
+          <i class="header-icon" nz-icon nz-tooltip nzTitle="This column shows the values that are actually used by Flink. These may differ from the configured values; Flink may adjust them to fit the actual setup, and automatically derives values that were not explicitly configured." nzType="info-circle"></i>
+        </th>
         <th class="table-header">Metric</th>
       </tr>
       </thead>
diff --git a/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.less b/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.less
index 7f8a3fb..3600694 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.less
+++ b/flink-runtime-web/web-dashboard/src/app/pages/task-manager/metrics/task-manager-metrics.component.less
@@ -22,6 +22,11 @@
   margin-bottom: 16px;
 }
 
+.header-icon {
+  position: relative;
+  top: 1px;
+}
+
 nz-card:first-child {
   margin-bottom: 16px;
 }