Skip to content

feature/add-metric-request #10

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

Merged
merged 1 commit into from
May 13, 2021
Merged

feature/add-metric-request #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions src/app/pages/cluster/cluster.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,4 @@ export class ClusterComponent extends ComponentBase implements OnInit, OnDestroy
this.subscriptions.push(deleteClusterById);
}

uninstallCuster(id: any) {
this.isDeleting = true;
this.idToDelete = id;
const deleteClusterById = this.clusterService.uninstallClusterById(id).pipe(
tap(() => {
this.clusters.forEach((cluster: Cluster) => {
if (cluster.id === id) {
cluster.status = Object.assign(cluster.status, {
status: 'Removing'
});
}
});
}),
delay(1000 * 10),
mergeMap((deleteResult: any) => {
return this.clusterService.getClusters();
})).subscribe((clusters: Cluster[]) => {
this.clusters = clusters;
this.receives();
});
this.subscriptions.push(deleteClusterById);
}
}
2 changes: 1 addition & 1 deletion src/app/pages/namespace/create/namespace.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class NamespaceCreateComponent extends ComponentBase implements OnInit, O
ngOnInit() {
this.receiving();
const getClusters = this.clusterService.getClusters().subscribe((clusters$: Cluster[]) => {
this.clusters = clusters$.map((c: Cluster) => {
this.clusters = clusters$.filter((c:Cluster)=>c.status.status === 'Active').map((c: Cluster) => {
return {
id: c.id,
text: c.name,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/namespace/functions/details/details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class DetailsComponent extends ComponentBase implements OnInit, OnDestroy
replicas: ReplicasStatus[];
isError: boolean = false;
events: Events[] = [];
private interval$ = timer(0, 1000 * 10);
private interval$ = timer(0, 1000 * 30);//1000 * 10

constructor(protected functionService: FunctionService,
private metricsService: MetricsService) {
Expand Down
37 changes: 20 additions & 17 deletions src/app/pages/namespace/functions/metrics/metrics.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export class MetricsComponent extends ComponentBase implements OnInit, OnDestroy

@Input('namespace') namespace: string;
@Input('functions') functions: Functions;
metrics: { memoryUsage?, memoryRequests?, memoryLimits?, networkTransit?, networkReceive?, cpuUsage?, fsUsage? ,cpuLimits?} = {};
private interval$ = timer(0, 1000 * 10);
metrics: { memoryUsage?, memoryRequests?, memoryLimits?, countSentSuccess?, countSentFailure?,requestTime?, cpuUsage?, fsUsage? ,cpuLimits?} = {};
private interval$ = timer(0, 1000 * 30);//TODO 1000 * 10

constructor(private functionService: FunctionService,
private metricsService: MetricsService) {
Expand All @@ -36,20 +36,14 @@ export class MetricsComponent extends ComponentBase implements OnInit, OnDestroy
return this.metricsService.formateMemory(value);
}

get networkReceive() {
const value = this.metrics.networkReceive;
return this.metricsService.formateMemory(value);
get countSentSuccess() {
return this.metrics.countSentSuccess || 0;
}

get networkTransit() {
const value = this.metrics.networkTransit;
return this.metricsService.formateMemory(value);
get countSentFailure() {
return this.metrics.countSentFailure || 0;
}

get fsUsage() {
const value = this.metrics.fsUsage;
return this.metricsService.formateMemory(value);
}

get cpuUsage() {
const value = this.metrics.cpuUsage;
Expand All @@ -66,17 +60,15 @@ export class MetricsComponent extends ComponentBase implements OnInit, OnDestroy
return ((this.metrics.memoryUsage * 100) / this.metrics.memoryRequests);
}

get networkProgressbar() {
return ((this.metrics.networkReceive * 100) / 10000);
get requestTime() {
return this.metrics.requestTime || 0;
}

get cpuUsageProgressbar() {
return ((this.metrics.cpuUsage * 100) / 10000);
}

get fsUsageProgressbar() {
return ((this.metrics.fsUsage * 100) / 10000000000);
}



getProgressbarTye(progressbar: number) {
Expand All @@ -90,6 +82,17 @@ export class MetricsComponent extends ComponentBase implements OnInit, OnDestroy
return 'danger';
}
}
getProgressbarRequestTime(progressbar: number) {
if (progressbar < 100) {
return 'primary';
}
if (progressbar >= 100 && progressbar < 400) {
return 'warning';
}
if (progressbar >= 400) {
return 'danger';
}
}

ngOnInit(): void {
this.subscriptions.push(this.receivingMetrics());
Expand Down
14 changes: 7 additions & 7 deletions src/app/pages/namespace/functions/metrics/metrics.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<span class="fw-semi-bold"> {{cpuUsage}} / {{cpuLimits}}</span>
</div>
<div class="bg-gray-lighter progress progress-xs">
<progressbar class="progress-sm mb-sm " [type]="getProgressbarTye(networkProgressbar)" [value]="cpuUsageProgressbar"></progressbar>
<progressbar class="progress-sm mb-sm " [type]="getProgressbarTye(cpuUsageProgressbar)" [value]="cpuUsageProgressbar"></progressbar>
</div>
<div class="clearfix fs-mini mt">
<span class="pull-right m-0 fw-semi-bold">Mem</span>
Expand All @@ -17,18 +17,18 @@
<progressbar class="progress-sm mb-sm " [type]="getProgressbarTye(memoryProgressbar)" [value]="memoryProgressbar"></progressbar>
</div>
<div class="clearfix fs-mini mt">
<span class="pull-right m-0 fw-semi-bold">Network</span>
<span class="fw-semi-bold">{{networkReceive}} <i class="fa fa-caret-down"></i> &nbsp; {{networkTransit}} <i class="fa fa-caret-up"></i></span>
<span class="pull-right m-0 fw-semi-bold">Request Count </span>
<span class="fw-semi-bold"><span class="badge badge-pill badge-success">{{countSentSuccess}}</span> /&nbsp;<span class="badge badge-pill badge-danger"> {{countSentFailure}}</span> </span>
</div>
<div class="bg-gray-lighter progress progress-xs">
<progressbar class="progress-sm mb-sm " [type]="getProgressbarTye(networkProgressbar)" [value]="networkProgressbar"></progressbar>

</div>
<div class="clearfix fs-mini mt">
<span class="pull-right m-0 fw-semi-bold">Filesystem</span>
<span class="fw-semi-bold">{{fsUsage}} <i class="fa fa-caret-up"></i> &nbsp; </span>
<span class="pull-right m-0 fw-semi-bold">Request Time</span>
<span class="fw-semi-bold">{{requestTime}} ms </span>
</div>
<div class="bg-gray-lighter progress progress-xs">
<progressbar class="progress-sm mb-sm " [type]="getProgressbarTye(fsUsageProgressbar)" [value]="fsUsageProgressbar"></progressbar>
<progressbar class="progress-sm mb-sm " [type]="getProgressbarRequestTime(requestTime)" value="100"></progressbar>
</div>
</div>
</section>
Expand Down