Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#7326 improve spark status widget #7423

Merged
merged 11 commits into from
May 24, 2018
Merged

#7326 improve spark status widget #7423

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c17bde
#7326: add endpoint for spark metrics executors
jaroslawmalekcodete May 23, 2018
7c4bd57
#7326: send sparkAppId
jaroslawmalekcodete May 23, 2018
ab3062c
#7326: send sparkAppId
jaroslawmalekcodete May 23, 2018
8c54553
#7326 add button with icon css class support
May 22, 2018
8b282b5
#7236: add _dom_classes support
jaroslawmalekcodete May 22, 2018
629af48
#7326 improve spark connection status widget
May 22, 2018
c390d88
#7326 connection progress basic styles
May 22, 2018
38534fc
#7326 stylize connection status widget
May 23, 2018
6baae7e
#7326 call spark REST Api for metrics
May 24, 2018
8e23627
#7326 update Spark metrics on Api call
May 24, 2018
abf31b1
Merge remote-tracking branch 'origin/master' into mariusz/7326
May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 60 additions & 0 deletions js/notebook/src/SparkUI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class SparkUIModel extends widgets.VBoxModel {

class SparkUIView extends widgets.VBoxView {
private sparkStats: Widget;
private sparkAppId: string;
private apiCallIntervalId: number;
private connectionLabelActive: HTMLElement;
private connectionLabelMemory: HTMLElement;
private connectionLabelDead: HTMLElement;
Expand All @@ -50,6 +52,7 @@ class SparkUIView extends widgets.VBoxView {
public update() {
super.update();

this.connectToApi();
this.processConnectionWidget();
this.updateLabels();
}
Expand Down Expand Up @@ -82,6 +85,10 @@ class SparkUIView extends widgets.VBoxView {
}

private appendSparkStats(): void {
if (this.sparkStats) {
return;
}

this.sparkStats = new Widget();
this.sparkStats.node.classList.add('bx-stats');
this.sparkStats.node.innerHTML = `
Expand All @@ -97,6 +104,54 @@ class SparkUIView extends widgets.VBoxView {
this.el.querySelector('.bx-connection-status').insertAdjacentElement('afterend', this.sparkStats.node);
}

private connectToApi() {
let baseUrl;
let api;

this.sparkAppId = this.model.get('sparkAppId');

if (!this.sparkAppId) {
return;
}

try {
const coreutils = require('@jupyterlab/coreutils');
coreutils.PageConfig.getOption('pageUrl');
baseUrl = coreutils.PageConfig.getBaseUrl();
} catch(e) {
baseUrl = `${window.location.origin}/`;
}

api = new BeakerXApi(baseUrl);
this.setApiCallInterval(api);
}

private setApiCallInterval(api: BeakerXApi): void {
const sparkUrl = `${api.getApiUrl('sparkmetrics/executors')}/${this.sparkAppId}`;
const getMetrict = async () => {
try {
const response = await fetch(sparkUrl);

if (!response.ok) {
console.log(response);

return;
}

const data = await response.json();
this.updateMetrics(data);
} catch(e) {
clearInterval(this.apiCallIntervalId)
}
};

this.apiCallIntervalId = setInterval(getMetrict, 1000);
}

private updateMetrics(data: object) {
console.log(data);
}

private processConnectionWidget() {
this.children_views.update(this.model.get('children')).then((views) => {
views.forEach((view) => {
Expand All @@ -110,6 +165,11 @@ class SparkUIView extends widgets.VBoxView {
});
});
}

despose() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks #7425

super.dispose();
clearInterval(this.apiCallIntervalId);
}
}

export default {
Expand Down