Removed _cat/plugins

Signed-off-by: Kishore Kumaar Natarajan <[email protected]>

Author: Kishore Kumaar Natarajan

cypress/e2e/5_live_queries.cy.js

@@ -368,10 +368,15 @@ describe('Inflight Queries Dashboard - WLM Enabled', () => {
     });
 
     // WLM enabled + workload groups
-    cy.intercept('GET', '**/api/cat_plugins', {
+    cy.intercept('GET', '**/api/_wlm/workload_group', {
+      statusCode: 200,
+      body: { workload_groups: [] },
+    }).as('getWlmEnabled');
+
+    cy.intercept('GET', '**/api/live_queries', {
       statusCode: 200,
-      body: { hasWlm: true },
-    }).as('getPluginsEnabled');
+      body: { response: { live_queries: [] } },
+    }).as('getQueryInsightsEnabled');
 
     cy.intercept('GET', '**/api/_wlm/workload_group', {
       statusCode: 200,
@@ -390,7 +395,7 @@ describe('Inflight Queries Dashboard - WLM Enabled', () => {
 
   it('displays WLM group links when WLM is enabled', () => {
     cy.wait('@getWorkloadGroups');
-    cy.wait('@getPluginsEnabled');
+    cy.wait('@getWlmEnabled');
 
     cy.get('tbody tr')
       .first()

public/pages/InflightQueries/InflightQueries.test.tsx

@@ -318,8 +318,8 @@ describe('InflightQueries', () => {
 
     // Mock WLM detection
     (core.http.get as jest.Mock).mockImplementation((url) => {
-      if (url === '/api/cat_plugins') {
-        return Promise.resolve({ hasWlm: true });
+      if (url === '/api/_wlm/workload_group') {
+        return Promise.resolve({ workload_groups: [] });
       }
       return Promise.resolve({});
     });
@@ -375,7 +375,12 @@ describe('InflightQueries', () => {
     (getVersionOnce as jest.Mock).mockResolvedValue('3.3.0');
     (isVersion33OrHigher as jest.Mock).mockReturnValue(true);
 
-    (core.http.get as jest.Mock).mockResolvedValue({ hasWlm: true });
+    (core.http.get as jest.Mock).mockImplementation((url) => {
+      if (url === '/api/_wlm/workload_group') {
+        return Promise.resolve({ workload_groups: [] });
+      }
+      return Promise.resolve({ response: { live_queries: [] } });
+    });
 
     mockLiveQueries(mockStubLiveQueries);
 
@@ -509,7 +514,12 @@ describe('InflightQueries', () => {
     (getVersionOnce as jest.Mock).mockResolvedValue('3.3.0');
     (isVersion33OrHigher as jest.Mock).mockReturnValue(true);
 
-    (core.http.get as jest.Mock).mockResolvedValue({ hasWlm: true });
+    (core.http.get as jest.Mock).mockImplementation((url) => {
+      if (url === '/api/_wlm/workload_group') {
+        return Promise.resolve({ workload_groups: [] });
+      }
+      return Promise.resolve({ response: { live_queries: [] } });
+    });
 
     mockLiveQueries({ ok: true, response: { live_queries: [] } });
 

public/pages/InflightQueries/InflightQueries.tsx

@@ -126,12 +126,13 @@ export const InflightQueries = ({
 
     try {
       const httpQuery = dataSource?.id ? { dataSourceId: dataSource.id } : undefined;
-      const res = await core.http.get('/api/cat_plugins', { query: httpQuery });
-      const has = !!res?.hasWlm;
-      wlmCacheRef.current[cacheKey] = has;
-      return has;
+      const res = await core.http.get('/api/_wlm/workload_group', { query: httpQuery });
+      const hasValidStructure =
+        res && typeof res === 'object' && Array.isArray(res.workload_groups);
+      wlmCacheRef.current[cacheKey] = hasValidStructure;
+      return hasValidStructure;
     } catch (e) {
-      console.warn('[LiveQueries] _cat/plugins detection failed; assuming WLM unavailable', e);
+      console.warn('[LiveQueries] WLM workload group API failed; assuming WLM unavailable', e);
       wlmCacheRef.current[cacheKey] = false;
       return false;
     }
@@ -141,11 +142,14 @@ export const InflightQueries = ({
     const checkWlmSupport = async () => {
       try {
         const version = await getVersionOnce(dataSource?.id || '');
+        console.log('[DEBUG] OpenSearch version detected:', version);
         const versionSupported = isVersion33OrHigher(version);
+        console.log('[DEBUG] Version 3.3+ supported:', versionSupported);
         setWlmGroupsSupported(versionSupported);
 
         if (versionSupported) {
           const hasWlm = await detectWlm();
+          console.log('[DEBUG] WLM available:', hasWlm);
           setWlmAvailable(hasWlm);
         } else {
           setWlmAvailable(false);
@@ -167,17 +171,15 @@ export const InflightQueries = ({
   }>({ total_completions: 0, total_cancellations: 0, total_rejections: 0 });
 
   const fetchActiveWlmGroups = useCallback(async () => {
-    if (!wlmGroupsSupported) {
-      setWorkloadGroupStats({ total_completions: 0, total_cancellations: 0, total_rejections: 0 });
-      setWlmGroupOptions([]);
-      return {};
-    }
+    console.log('[DEBUG] fetchActiveWlmGroups called, wlmGroupsSupported:', wlmGroupsSupported);
 
     const httpQuery = dataSource?.id ? { dataSourceId: dataSource.id } : undefined;
     let statsBody: WlmStatsBody = {};
     try {
+      console.log('[DEBUG] Making WLM stats API call to:', API_ENDPOINTS.WLM_STATS);
       const statsRes = await core.http.get(API_ENDPOINTS.WLM_STATS, { query: httpQuery });
-      statsBody = (statsRes as { body?: unknown }).body as WlmStatsBody;
+      console.log('[DEBUG] WLM stats response:', statsRes);
+      statsBody = statsRes as WlmStatsBody;
     } catch (e) {
       console.warn('[LiveQueries] Failed to fetch WLM stats', e);
       setWorkloadGroupStats({ total_completions: 0, total_cancellations: 0, total_rejections: 0 });
@@ -229,16 +231,25 @@ export const InflightQueries = ({
       }
     }
 
+    console.log(
+      '[DEBUG] Parsed stats - completions:',
+      completions,
+      'cancellations:',
+      cancellations,
+      'rejections:',
+      rejections
+    );
+
     setWorkloadGroupStats({
       total_completions: completions,
       total_cancellations: cancellations,
       total_rejections: rejections,
     });
 
-    // fetch group NAMES only if plugin exists (but do not block the stats)
+    // fetch group NAMES only if plugin exists and version supported
     const idToNameMap: Record<string, string> = {};
     try {
-      if (wlmAvailable) {
+      if (wlmAvailable && wlmGroupsSupported) {
         const groupsRes = await core.http.get(API_ENDPOINTS.WLM_WORKLOAD_GROUP, {
           query: httpQuery,
         });
@@ -253,10 +264,12 @@ export const InflightQueries = ({
       console.warn('[LiveQueries] Failed to fetch workload groups', e);
     }
 
-    const options = Array.from(activeGroupIds).map((id) => ({ id, name: idToNameMap[id] || id }));
+    const options = wlmGroupsSupported
+      ? Array.from(activeGroupIds).map((id) => ({ id, name: idToNameMap[id] || id }))
+      : [];
     setWlmGroupOptions(options);
     return idToNameMap;
-  }, [core.http, dataSource?.id, wlmGroupId, wlmAvailable]);
+  }, [core.http, dataSource?.id, wlmGroupId, wlmGroupsSupported]);
 
   const liveQueries = query?.response?.live_queries ?? [];
 
@@ -353,13 +366,22 @@ export const InflightQueries = ({
     if (isFetching.current) return;
     isFetching.current = true;
     try {
-      const budget = Math.max(2000, refreshInterval - 500);
-      const map = await withTimeout(fetchActiveWlmGroups(), budget).catch(() => undefined);
-      await fetchLiveQueries(map);
+      if (wlmGroupsSupported) {
+        try {
+          await withTimeout(fetchActiveWlmGroups(), refreshInterval - 500);
+        } catch (e) {
+          console.warn('[LiveQueries] fetchActiveWlmGroups timed out or failed', e);
+        }
+      }
+      try {
+        await withTimeout(fetchLiveQueries(), refreshInterval - 500);
+      } catch (e) {
+        console.warn('[LiveQueries] fetchLiveQueries timed out or failed', e);
+      }
     } finally {
       isFetching.current = false;
     }
-  }, [refreshInterval, fetchActiveWlmGroups, fetchLiveQueries]);
+  }, [refreshInterval, fetchActiveWlmGroups, fetchLiveQueries, wlmGroupsSupported]);
 
   useEffect(() => {
     void fetchLiveQueriesSafe();
@@ -370,7 +392,7 @@ export const InflightQueries = ({
     }, refreshInterval);
 
     return () => clearInterval(interval);
-  }, [autoRefreshEnabled, refreshInterval, fetchLiveQueriesSafe]);
+  }, [autoRefreshEnabled, refreshInterval, fetchLiveQueriesSafe, wlmGroupsSupported]);
 
   const [pagination, setPagination] = useState({ pageIndex: 0 });
   const [tableQuery, setTableQuery] = useState('');
@@ -574,7 +596,7 @@ export const InflightQueries = ({
               <EuiButton
                 iconType="refresh"
                 onClick={async () => {
-                  await fetchLiveQueries();
+                  await fetchLiveQueriesSafe();
                 }}
                 data-test-subj="live-queries-refresh-button"
               >
@@ -906,7 +928,7 @@ export const InflightQueries = ({
                 key="refresh-button"
                 iconType="refresh"
                 onClick={async () => {
-                  await fetchLiveQueries();
+                  await fetchLiveQueriesSafe();
                 }}
               >
                 Refresh

public/pages/WorkloadManagement/WLMMain/WLMMain.tsx

@@ -163,10 +163,12 @@ export const WorkloadManagementMain = ({
   // === API Calls ===
   const checkQueryInsightsAvailability = async () => {
     try {
-      const response = await core.http.get('/api/cat_plugins', {
+      const res = await core.http.get('/api/live_queries', {
         query: { dataSourceId: dataSource.id },
       });
-      setIsQueryInsightsAvailable(response.hasQueryInsights || false);
+      const hasValidStructure =
+        res && typeof res === 'object' && res.response && Array.isArray(res.response.live_queries);
+      setIsQueryInsightsAvailable(hasValidStructure);
     } catch (error) {
       setIsQueryInsightsAvailable(false);
     }

server/routes/index.ts

@@ -280,67 +280,6 @@ export function defineRoutes(router: IRouter, dataSourceEnabled: boolean) {
     }
   );
 
-  router.get(
-    {
-      path: '/api/cat_plugins',
-      validate: {
-        query: schema.object({
-          dataSourceId: schema.maybe(schema.string()),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const { dataSourceId } = request.query;
-
-        // Always use _cat (JSON) as requested
-        const catPath = '/_cat/plugins?format=json';
-
-        let resp: any;
-        if (dataSourceEnabled && dataSourceId) {
-          // Data source-aware client (proxies to the selected cluster)
-          const dsClient = context.dataSource.opensearch.legacy.getClient(dataSourceId);
-          resp = await dsClient.callAPI('transport.request', {
-            method: 'GET',
-            path: catPath,
-          });
-        } else {
-          // Fallback: core client as current user
-          const es = context.core.opensearch.client.asCurrentUser;
-          resp = await es.transport.request({
-            method: 'GET',
-            path: catPath,
-          });
-        }
-
-        const body = resp?.body ?? resp; // legacy/new client normalization
-        const rows: Array<Record<string, any>> = Array.isArray(body) ? body : [];
-
-        // Check for query insights and WLM plugins
-        const hasQueryInsights = rows.some((p) => {
-          const s = `${p?.component ?? ''} ${p?.name ?? ''}`.toLowerCase();
-          return s.includes('query-insights') || s.includes('queryinsights');
-        });
-
-        const hasWlm = rows.some((p) => {
-          const s = `${p?.component ?? ''} ${p?.name ?? ''}`.toLowerCase();
-          return s.includes('workload') || s.includes('wlm');
-        });
-
-        return response.ok({ body: { ok: true, hasQueryInsights, hasWlm } });
-      } catch (err: any) {
-        return response.ok({
-          body: {
-            ok: false,
-            hasQueryInsights: false,
-            hasWlm: false,
-            error: err?.message ?? 'cat plugins failed',
-          },
-        });
-      }
-    }
-  );
-
   router.put(
     {
       path: '/api/update_settings',