This is an automated email from the ASF dual-hosted git repository.
wilfreds pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-web.git
The following commit(s) were added to refs/heads/master by this push:
new 271bb72 [YUNIKORN-2087] reinstate node utilisation rest endpoint
(#145)
271bb72 is described below
commit 271bb7210ea4cdccc02d671c088525de65c637b0
Author: Wilfred Spiegelenburg <[email protected]>
AuthorDate: Wed Nov 8 13:21:43 2023 +1100
[YUNIKORN-2087] reinstate node utilisation rest endpoint (#145)
The node utilisation endpoint is required to be exposed for the
dashboard to work after YUNIKORN-325
Moving the endpoint to /ws/v1/scheduler/node-utilization
The endpoint will need to change as part of YUNIKORN-2088
Closes: #145
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
json-routes.json | 2 +-
src/app/services/scheduler/scheduler.service.ts | 38 ++++++++++++-------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/json-routes.json b/json-routes.json
index 7bb5032..797c575 100644
--- a/json-routes.json
+++ b/json-routes.json
@@ -1,5 +1,5 @@
{
- "/ws/v1/nodes/utilization": "/utilization",
+ "/ws/v1/scheduler/node-utilization": "/utilization",
"/ws/v1/*": "/$1",
"/history/apps": "/appHistory",
"/history/containers": "/containerHistory",
diff --git a/src/app/services/scheduler/scheduler.service.ts
b/src/app/services/scheduler/scheduler.service.ts
index e8803a9..25f0d05 100644
--- a/src/app/services/scheduler/scheduler.service.ts
+++ b/src/app/services/scheduler/scheduler.service.ts
@@ -16,24 +16,24 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { QueueInfo, QueuePropertyItem } from '@app/models/queue-info.model';
-import { EnvconfigService } from '../envconfig/envconfig.service';
-import { ClusterInfo } from '@app/models/cluster-info.model';
-import { CommonUtil } from '@app/utils/common.util';
-import { SchedulerResourceInfo } from '@app/models/resource-info.model';
-import { AppInfo } from '@app/models/app-info.model';
-import { AllocationInfo } from '@app/models/alloc-info.model';
-import { HistoryInfo } from '@app/models/history-info.model';
-import { NodeInfo } from '@app/models/node-info.model';
-import { NOT_AVAILABLE } from '@app/utils/constants';
-import { Partition } from '@app/models/partition-info.model';
-import { SchedulerHealthInfo } from "@app/models/scheduler-health-info.model";
-import { NodeUtilization } from '@app/models/node-utilization.model';
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {AllocationInfo} from '@app/models/alloc-info.model';
+import {AppInfo} from '@app/models/app-info.model';
+import {ClusterInfo} from '@app/models/cluster-info.model';
+import {HistoryInfo} from '@app/models/history-info.model';
+import {NodeInfo} from '@app/models/node-info.model';
+import {NodeUtilization} from '@app/models/node-utilization.model';
+import {Partition} from '@app/models/partition-info.model';
+
+import {QueueInfo, QueuePropertyItem} from '@app/models/queue-info.model';
+import {SchedulerResourceInfo} from '@app/models/resource-info.model';
+import {SchedulerHealthInfo} from "@app/models/scheduler-health-info.model";
+import {CommonUtil} from '@app/utils/common.util';
+import {NOT_AVAILABLE} from '@app/utils/constants';
+import {Observable} from 'rxjs';
+import {map} from 'rxjs/operators';
+import {EnvconfigService} from '../envconfig/envconfig.service';
@Injectable({
providedIn: 'root',
@@ -255,7 +255,7 @@ export class SchedulerService {
}
fetchNodeUtilization(): Observable<NodeUtilization[]>{
- const nodeUtilizationUrl =
`${this.envConfig.getSchedulerWebAddress()}/ws/v1/nodes/utilization`;
+ const nodeUtilizationUrl =
`${this.envConfig.getSchedulerWebAddress()}/ws/v1/scheduler/node-utilization`;
return this.httpClient.get(nodeUtilizationUrl).pipe(map((data: any) =>
data as NodeUtilization[]));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
