forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-17608][web] Add TM log and stdout page/tab back
This closes apache#12085.
- Loading branch information
Showing
12 changed files
with
276 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
...untime-web/web-dashboard/src/app/pages/task-manager/logs/task-manager-logs.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <!-- | ||
| ~ 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 | ||
| ~ | ||
| ~ https://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. | ||
| --> | ||
|
|
||
| <flink-monaco-editor [value]="logs"></flink-monaco-editor> | ||
| <flink-refresh-download [compactMode]="true" [downloadHref]="'taskmanagers/'+taskManagerDetail?.id+'/log'" [downloadName]="'taskmanager_'+taskManagerDetail?.id+'_log'" (reload)="reload()"></flink-refresh-download> | ||
|
|
28 changes: 28 additions & 0 deletions
28
...untime-web/web-dashboard/src/app/pages/task-manager/logs/task-manager-logs.component.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| @import "theme"; | ||
|
|
||
| flink-monaco-editor { | ||
| height: calc(~"100vh - 310px"); | ||
| } | ||
|
|
||
| :host { | ||
| position: relative; | ||
| display: block; | ||
| border: 1px solid @border-color-split; | ||
| } |
60 changes: 60 additions & 0 deletions
60
...-runtime-web/web-dashboard/src/app/pages/task-manager/logs/task-manager-logs.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
|
|
||
| import { ChangeDetectorRef, Component, OnInit, ViewChild, ChangeDetectionStrategy } from '@angular/core'; | ||
| import { TaskManagerDetailInterface } from 'interfaces'; | ||
| import { first } from 'rxjs/operators'; | ||
| import { TaskManagerService } from 'services'; | ||
| import { MonacoEditorComponent } from 'share/common/monaco-editor/monaco-editor.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'flink-task-manager-logs', | ||
| templateUrl: './task-manager-logs.component.html', | ||
| styleUrls: ['./task-manager-logs.component.less'], | ||
| changeDetection: ChangeDetectionStrategy.OnPush | ||
| }) | ||
| export class TaskManagerLogsComponent implements OnInit { | ||
| @ViewChild(MonacoEditorComponent) monacoEditorComponent: MonacoEditorComponent; | ||
| logs = ''; | ||
| taskManagerDetail: TaskManagerDetailInterface; | ||
|
|
||
| reload() { | ||
| if (this.taskManagerDetail) { | ||
| this.taskManagerService.loadLogs(this.taskManagerDetail.id).subscribe( | ||
| data => { | ||
| this.monacoEditorComponent.layout(); | ||
| this.logs = data; | ||
| this.cdr.markForCheck(); | ||
| }, | ||
| () => { | ||
| this.cdr.markForCheck(); | ||
| } | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| constructor(private taskManagerService: TaskManagerService, private cdr: ChangeDetectorRef) {} | ||
|
|
||
| ngOnInit() { | ||
| this.taskManagerService.taskManagerDetail$.pipe(first()).subscribe(data => { | ||
| this.taskManagerDetail = data; | ||
| this.reload(); | ||
| this.cdr.markForCheck(); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...me-web/web-dashboard/src/app/pages/task-manager/stdout/task-manager-stdout.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <!-- | ||
| ~ 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 | ||
| ~ | ||
| ~ https://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. | ||
| --> | ||
|
|
||
| <flink-monaco-editor [value]="stdout"></flink-monaco-editor> | ||
| <flink-refresh-download [compactMode]="true" [downloadHref]="'taskmanagers/'+taskManagerDetail?.id+'/stdout'" [downloadName]="'taskmanager_'+taskManagerDetail?.id+'_stdout'" (reload)="reload()"></flink-refresh-download> |
28 changes: 28 additions & 0 deletions
28
...me-web/web-dashboard/src/app/pages/task-manager/stdout/task-manager-stdout.component.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| @import "theme"; | ||
|
|
||
| flink-monaco-editor { | ||
| height: calc(~"100vh - 310px"); | ||
| } | ||
|
|
||
| :host { | ||
| position: relative; | ||
| display: block; | ||
| border: 1px solid @border-color-split; | ||
| } |
60 changes: 60 additions & 0 deletions
60
...time-web/web-dashboard/src/app/pages/task-manager/stdout/task-manager-stdout.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
|
|
||
| import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; | ||
| import { TaskManagerDetailInterface } from 'interfaces'; | ||
| import { first } from 'rxjs/operators'; | ||
| import { TaskManagerService } from 'services'; | ||
| import { MonacoEditorComponent } from 'share/common/monaco-editor/monaco-editor.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'flink-task-manager-stdout', | ||
| templateUrl: './task-manager-stdout.component.html', | ||
| styleUrls: ['./task-manager-stdout.component.less'], | ||
| changeDetection: ChangeDetectionStrategy.OnPush | ||
| }) | ||
| export class TaskManagerStdoutComponent implements OnInit { | ||
| @ViewChild(MonacoEditorComponent) monacoEditorComponent: MonacoEditorComponent; | ||
| stdout = ''; | ||
| taskManagerDetail: TaskManagerDetailInterface; | ||
|
|
||
| reload() { | ||
| if (this.taskManagerDetail) { | ||
| this.taskManagerService.loadStdout(this.taskManagerDetail.id).subscribe( | ||
| data => { | ||
| this.monacoEditorComponent.layout(); | ||
| this.stdout = data; | ||
| this.cdr.markForCheck(); | ||
| }, | ||
| () => { | ||
| this.cdr.markForCheck(); | ||
| } | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| constructor(private taskManagerService: TaskManagerService, private cdr: ChangeDetectorRef) {} | ||
|
|
||
| ngOnInit() { | ||
| this.taskManagerService.taskManagerDetail$.pipe(first()).subscribe(data => { | ||
| this.taskManagerDetail = data; | ||
| this.reload(); | ||
| this.cdr.markForCheck(); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters