Fix for mds in server/wlmRoutes (#411)

* fix for mds in server/wlmRoutes

Signed-off-by: Lingxi Chen <[email protected]>

* yarn lint fix

Signed-off-by: Lingxi Chen <[email protected]>

* retrigger ut tests

Signed-off-by: Lingxi Chen <[email protected]>

* updated route for _wlm/thresholds

Signed-off-by: Lingxi Chen <[email protected]>

* fix ut

Signed-off-by: Lingxi Chen <[email protected]>

* triggering test

Signed-off-by: Lingxi Chen <[email protected]>

---------

Signed-off-by: Lingxi Chen <[email protected]>
Co-authored-by: Lingxi Chen <[email protected]>

Author: Lindsay-00

.github/workflows/build-and-test.yml

@@ -54,6 +54,7 @@ jobs:
       - name: Bootstrap plugin/OpenSearch-Dashboards
         run: |
           cd OpenSearch-Dashboards/plugins/query-insights-dashboards
+          yarn cache clean --all
           yarn osd bootstrap
       - name: Run unit tests
         run: |

public/pages/WorkloadManagement/WLMMain/WLMMain.tsx

@@ -282,7 +282,9 @@ export const WorkloadManagementMain = ({
       const thresholds = await core.http.get<{
         cpuRejectionThreshold: number;
         memoryRejectionThreshold: number;
-      }>('/api/_wlm/thresholds');
+      }>('/api/_wlm/thresholds', {
+        query: { dataSourceId: dataSource.id },
+      });
       const cpuThreshold = thresholds?.cpuRejectionThreshold ?? 1;
       const memoryThreshold = thresholds?.memoryRejectionThreshold ?? 1;
 

server/clusters/wlmPlugin.ts

@@ -0,0 +1,129 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const WlmPlugin = function (Client: any, config: any, components: any) {
+  const ca = components.clientAction.factory;
+  Client.prototype.wlm = components.clientAction.namespaceFactory();
+  const wlm = Client.prototype.wlm.prototype;
+
+  // Get WLM stats across all nodes
+  wlm.getStats = ca({
+    url: { fmt: '/_wlm/stats' },
+    method: 'GET',
+  });
+
+  // Get WLM stats for a specific node
+  wlm.getNodeStats = ca({
+    url: {
+      fmt: '/_wlm/<%=nodeId%>/stats',
+      req: {
+        nodeId: { type: 'string', required: true },
+      },
+    },
+    method: 'GET',
+  });
+
+  // List all workload groups
+  wlm.getWorkloadGroups = ca({
+    url: { fmt: '/_wlm/workload_group' },
+    method: 'GET',
+  });
+
+  // Get workload group by name
+  wlm.getWorkloadGroup = ca({
+    url: {
+      fmt: '/_wlm/workload_group/<%=name%>',
+      req: {
+        name: { type: 'string', required: true },
+      },
+    },
+    method: 'GET',
+  });
+
+  // Create workload group
+  wlm.createWorkloadGroup = ca({
+    url: { fmt: '/_wlm/workload_group' },
+    method: 'PUT',
+    needBody: true,
+  });
+
+  // Update workload group
+  wlm.updateWorkloadGroup = ca({
+    url: {
+      fmt: '/_wlm/workload_group/<%=name%>',
+      req: {
+        name: { type: 'string', required: true },
+      },
+    },
+    method: 'PUT',
+    needBody: true,
+  });
+
+  // Delete workload group
+  wlm.deleteWorkloadGroup = ca({
+    url: {
+      fmt: '/_wlm/workload_group/<%=name%>',
+      req: {
+        name: { type: 'string', required: true },
+      },
+    },
+    method: 'DELETE',
+  });
+
+  // Get stats for specific workload group
+  wlm.getWorkloadGroupStats = ca({
+    url: {
+      fmt: '/_wlm/stats/<%=workloadGroupId%>',
+      req: {
+        workloadGroupId: { type: 'string', required: true },
+      },
+    },
+    method: 'GET',
+  });
+
+  // Create index rule
+  wlm.createRule = ca({
+    url: { fmt: '/_rules/workload_group' },
+    method: 'PUT',
+    needBody: true,
+  });
+
+  // Get all index rules
+  wlm.getRules = ca({
+    url: { fmt: '/_rules/workload_group' },
+    method: 'GET',
+  });
+
+  // Delete index rule
+  wlm.deleteRule = ca({
+    url: {
+      fmt: '/_rules/workload_group/<%=ruleId%>',
+      req: {
+        ruleId: { type: 'string', required: true },
+      },
+    },
+    method: 'DELETE',
+  });
+
+  // Update index rule
+  wlm.updateRule = ca({
+    url: {
+      fmt: '/_rules/workload_group/<%=ruleId%>',
+      req: {
+        ruleId: { type: 'string', required: true },
+      },
+    },
+    method: 'PUT',
+    needBody: true,
+  });
+
+  // Get node level cpu and memory threshold
+  wlm.getThresholds = ca({
+    url: { fmt: '/_cluster/settings' },
+    method: 'GET',
+    needBody: false,
+    qs: ['include_defaults'],
+  });
+};

server/plugin.ts

@@ -12,6 +12,7 @@ import {
   ILegacyCustomClusterClient,
 } from '../../../src/core/server';
 import { QueryInsightsPlugin } from './clusters/queryInsightsPlugin';
+import { WlmPlugin } from './clusters/wlmPlugin';
 
 import { QueryInsightsDashboardsPluginSetup, QueryInsightsDashboardsPluginStart } from './types';
 import { defineRoutes } from './routes';
@@ -50,10 +51,28 @@ export class QueryInsightsDashboardsPlugin
         queryInsightsClient,
       };
     });
+    // Register WLM custom client
+    const wlmClient: ILegacyCustomClusterClient = core.opensearch.legacy.createClient(
+      'opensearch_wlm',
+      {
+        plugins: [WlmPlugin],
+      }
+    );
+    if (dataSourceEnabled) {
+      dataSource.registerCustomApiSchema(WlmPlugin);
+    }
+
+    // @ts-ignore - Register WLM context
+    core.http.registerRouteHandlerContext('wlm_plugin', (_context, _request) => {
+      return {
+        logger: this.logger,
+        wlmClient,
+      };
+    });
 
     // Register server side APIs
     defineRoutes(router, dataSourceEnabled);
-    defineWlmRoutes(router);
+    defineWlmRoutes(router, dataSourceEnabled);
 
     return {};
   }