[FLINK-26206][runtime-web] add service layer abstraction and refactor…

… config service
jonchase · May 12, 2022 · 13ad359 · 13ad359
1 parent 278f5f9
commit 13ad359
Show file tree

Hide file tree

Showing 84 changed files with 1,078 additions and 664 deletions.
diff --git a/flink-runtime-web/web-dashboard/src/app/app.component.ts b/flink-runtime-web/web-dashboard/src/app/app.component.ts
@@ -20,7 +20,7 @@ import { Component } from '@angular/core';
 import { fromEvent, merge } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { StatusService } from 'services';
+import { StatusService } from '@flink-runtime-web/services';
 
 @Component({
   selector: 'flink-root',

diff --git a/flink-runtime-web/web-dashboard/src/app/app.interceptor.ts b/flink-runtime-web/web-dashboard/src/app/app.interceptor.ts
@@ -21,10 +21,9 @@ import { Injectable, Injector } from '@angular/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
+import { StatusService } from '@flink-runtime-web/services';
 import { NzNotificationService, NzNotificationDataOptions } from 'ng-zorro-antd/notification';
 
-import { StatusService } from 'services';
-
 @Injectable()
 export class AppInterceptor implements HttpInterceptor {
   constructor(private readonly injector: Injector) {}

diff --git a/flink-runtime-web/web-dashboard/src/app/app.module.ts b/flink-runtime-web/web-dashboard/src/app/app.module.ts
@@ -62,6 +62,8 @@ import {
   ShrinkOutline,
   PicCenterOutline
 } from '@ant-design/icons-angular/icons';
+import { Configuration } from '@flink-runtime-web/interfaces';
+import { StatusService } from '@flink-runtime-web/services';
 import { NzAlertModule } from 'ng-zorro-antd/alert';
 import { NzBadgeModule } from 'ng-zorro-antd/badge';
 import { NZ_CONFIG, NzConfig } from 'ng-zorro-antd/core/config';
@@ -73,9 +75,6 @@ import { NzLayoutModule } from 'ng-zorro-antd/layout';
 import { NzMenuModule } from 'ng-zorro-antd/menu';
 import { NzNotificationModule } from 'ng-zorro-antd/notification';
 
-import { Configuration } from 'interfaces';
-import { StatusService } from 'services';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { AppInterceptor } from './app.interceptor';

diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/job-accumulators.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/job-accumulators.ts
@@ -16,6 +16,11 @@
  * limitations under the License.
  */
 
+export interface JobAccumulators {
+  main: UserAccumulators[];
+  subtasks: SubTaskAccumulators[];
+}
+
 export interface UserAccumulators {
   name: string;
   type: string;

diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/job-checkpoint.ts
@@ -28,6 +28,8 @@ export interface Checkpoint {
     checkpointed_size: CheckpointMinMaxAvgStatistics;
     state_size: CheckpointMinMaxAvgStatistics;
     end_to_end_duration: CheckpointMinMaxAvgStatistics;
+    processed_data: CheckpointMinMaxAvgStatistics;
+    persisted_data: CheckpointMinMaxAvgStatistics;
     alignment_buffered: CheckpointMinMaxAvgStatistics;
   };
   latest: {

diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/job-manager.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/job-manager.ts
@@ -16,11 +16,22 @@
  * limitations under the License.
  */
 
+export interface JobManagerConfig {
+  key: string;
+  value: string;
+}
+
 export interface JobManagerLogItem {
   name: string;
   size: number;
   mtime: number;
 }
+
+export interface JobManagerLogDetail {
+  data: string;
+  url: string;
+}
+
 export interface JobManagerThreadDump {
   threadInfos: JobManagerThreadInfo[];
 }

diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/job-metrics.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/job-metrics.ts
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface JobMetric {
+  id: string;
+  value: string;
+}
+
+export interface MetricMap {
+  [p: string]: number;
+}
+
+export interface MetricMapWithTimestamp {
+  timestamp: number;
+  values: MetricMap;
+}
+
+export interface Watermarks {
+  lowWatermark: number;
+  watermarks: MetricMap;
+}
diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/plan.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/plan.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { NodesItem } from './job-detail';
+import { NodesItem, NodesItemCorrect, VerticesLink } from './job-detail';
 
 export interface Plan {
   plan: {
@@ -25,3 +25,8 @@ export interface Plan {
     nodes: NodesItem[];
   };
 }
+
+export interface PlanDetail {
+  nodes: NodesItemCorrect[];
+  links: VerticesLink[];
+}
diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/public-api.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/public-api.ts
@@ -33,3 +33,4 @@ export * from './overview';
 export * from './task-manager';
 export * from './job-accumulators';
 export * from './job-manager';
+export * from './job-metrics';
diff --git a/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts b/flink-runtime-web/web-dashboard/src/app/interfaces/task-manager.ts
@@ -17,7 +17,7 @@
  */
 
 export interface TaskManagerList {
-  taskmanagers: TaskmanagersItem[];
+  taskmanagers: TaskManagersItem[];
 }
 
 export interface TaskManagerDetail {
@@ -38,7 +38,12 @@ export interface TaskManagerLogItem {
   mtime: number;
 }
 
-export interface TaskmanagersItem {
+export interface TaskManagerLogDetail {
+  data: string;
+  url: string;
+}
+
+export interface TaskManagersItem {
   id: string;
   path: string;
   dataPort: number;

diff --git a/...-dashboard/src/app/pages/job-manager/configuration/job-manager-configuration.component.ts b/...-dashboard/src/app/pages/job-manager/configuration/job-manager-configuration.component.ts
@@ -18,7 +18,7 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
 
-import { JobManagerService } from 'services';
+import { JobManagerService } from '@flink-runtime-web/services';
 
 @Component({
   selector: 'flink-job-manager-configuration',

diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/job-manager.module.ts b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/job-manager.module.ts
@@ -20,6 +20,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
+import { ShareModule } from '@flink-runtime-web/share/share.module';
 import { NzBreadCrumbModule } from 'ng-zorro-antd/breadcrumb';
 import { NzCardModule } from 'ng-zorro-antd/card';
 import { NzCodeEditorModule } from 'ng-zorro-antd/code-editor';
@@ -28,7 +29,6 @@ import { NzIconModule } from 'ng-zorro-antd/icon';
 import { NzProgressModule } from 'ng-zorro-antd/progress';
 import { NzTableModule } from 'ng-zorro-antd/table';
 import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
-import { ShareModule } from 'share/share.module';
 
 import { JobManagerConfigurationComponent } from './configuration/job-manager-configuration.component';
 import { JobManagerRoutingModule } from './job-manager-routing.module';

diff --git a/...eb/web-dashboard/src/app/pages/job-manager/log-detail/job-manager-log-detail.component.ts b/...eb/web-dashboard/src/app/pages/job-manager/log-detail/job-manager-log-detail.component.ts
@@ -21,10 +21,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Subject } from 'rxjs';
 import { finalize, takeUntil } from 'rxjs/operators';
 
+import { JobManagerService } from '@flink-runtime-web/services';
+import { flinkEditorOptions } from '@flink-runtime-web/share/common/editor/editor-config';
 import { EditorOptions } from 'ng-zorro-antd/code-editor/typings';
-import { flinkEditorOptions } from 'share/common/editor/editor-config';
-
-import { JobManagerService } from 'services';
 
 @Component({
   selector: 'flink-job-manager-log-detail',

diff --git a/...me-web/web-dashboard/src/app/pages/job-manager/log-list/job-manager-log-list.component.ts b/...me-web/web-dashboard/src/app/pages/job-manager/log-list/job-manager-log-list.component.ts
@@ -19,8 +19,8 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 
-import { JobManagerLogItem } from 'interfaces';
-import { JobManagerService } from 'services';
+import { JobManagerLogItem } from '@flink-runtime-web/interfaces';
+import { JobManagerService } from '@flink-runtime-web/services';
 
 import { typeDefinition } from '../../../utils/strong-type';
 

diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job-manager/logs/job-manager-logs.component.ts b/flink-runtime-web/web-dashboard/src/app/pages/job-manager/logs/job-manager-logs.component.ts
@@ -17,9 +17,9 @@
  */
 
 import { ChangeDetectorRef, Component, OnInit, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
-import { JobManagerService } from 'services';
+import { JobManagerService } from '@flink-runtime-web/services';
 import { EditorOptions } from 'ng-zorro-antd/code-editor/typings';
-import { flinkEditorOptions } from 'share/common/editor/editor-config';
+import { flinkEditorOptions } from '@flink-runtime-web/share/common/editor/editor-config';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 

diff --git a/...time-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.ts b/...time-web/web-dashboard/src/app/pages/job-manager/metrics/job-manager-metrics.component.ts
@@ -20,7 +20,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { Subject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 
-import { JobManagerService, StatusService } from 'services';
+import { JobManagerService, StatusService } from '@flink-runtime-web/services';
 
 @Component({
   selector: 'flink-job-manager-metrics',
@@ -51,14 +51,14 @@ export class JobManagerMetricsComponent implements OnInit, OnDestroy {
     });
     this.statusService.refresh$.pipe(takeUntil(this.destroy$)).subscribe(() => {
       this.jobManagerService
-        .getMetricsName()
+        .loadMetricsName()
         .pipe(map(arr => arr.filter(item => item.indexOf('Status.JVM.GarbageCollector') !== -1)))
         .subscribe(data => {
           this.listOfGCName = data;
           this.cdr.markForCheck();
         });
       this.jobManagerService
-        .getMetrics([
+        .loadMetrics([
           'Status.JVM.Memory.Heap.Used',
           'Status.JVM.Memory.Heap.Max',
           'Status.JVM.Memory.Metaspace.Used',

diff --git a/...untime-web/web-dashboard/src/app/pages/job-manager/stdout/job-manager-stdout.component.ts b/...untime-web/web-dashboard/src/app/pages/job-manager/stdout/job-manager-stdout.component.ts
@@ -20,10 +20,9 @@ import { ChangeDetectorRef, Component, OnInit, ChangeDetectionStrategy, OnDestro
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
+import { JobManagerService } from '@flink-runtime-web/services';
+import { flinkEditorOptions } from '@flink-runtime-web/share/common/editor/editor-config';
 import { EditorOptions } from 'ng-zorro-antd/code-editor/typings';
-import { flinkEditorOptions } from 'share/common/editor/editor-config';
-
-import { JobManagerService } from 'services';
 
 @Component({
   selector: 'flink-job-manager-stdout',

diff --git a/.../web-dashboard/src/app/pages/job-manager/thread-dump/job-manager-thread-dump.component.ts b/.../web-dashboard/src/app/pages/job-manager/thread-dump/job-manager-thread-dump.component.ts
@@ -20,10 +20,9 @@ import { ChangeDetectorRef, Component, OnInit, ChangeDetectionStrategy, OnDestro
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
+import { JobManagerService } from '@flink-runtime-web/services';
+import { flinkEditorOptions } from '@flink-runtime-web/share/common/editor/editor-config';
 import { EditorOptions } from 'ng-zorro-antd/code-editor/typings';
-import { flinkEditorOptions } from 'share/common/editor/editor-config';
-
-import { JobManagerService } from 'services';
 
 @Component({
   selector: 'flink-job-manager-thread-dump',