[Backport 2.17] Fallback to cluster health on remote info failure (op…

…ensearch-project#895) * fallback if get remote info fails to cluster health call (opensearch-project#886) Signed-off-by: Amit Galitzky <amgalitz@amazon.com> * add correct snapshots Signed-off-by: Amit Galitzky <amgalitz@amazon.com> * change upload artifact version Signed-off-by: Amit Galitzky <amgalitz@amazon.com> --------- Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
SuZhou-Joe · Oct 14, 2024 · f22b65c · f22b65c
1 parent 32f28de
commit f22b65c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/remote-integ-tests-workflow.yml b/.github/workflows/remote-integ-tests-workflow.yml
@@ -153,14 +153,14 @@ jobs:
         working-directory: opensearch-dashboards-functional-test
 
       - name: Capture failure screenshots
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: cypress-screenshots-${{ matrix.os }}
           path: opensearch-dashboards-functional-test/cypress/screenshots
 
       - name: Capture failure test video
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: cypress-videos-${{ matrix.os }}

diff --git a/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap b/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap
@@ -1593,7 +1593,7 @@ exports[`<DefineDetector /> empty creating detector definition renders the compo
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                      d="m9.759 12.652-1.8 2.25-.78-.625 1.8-2.25A.1.1 0 0 0 9 11.965V8.362a1 1 0 0 1 .232-.64l4.631-5.558A.1.1 0 0 0 13.787 2H2.213a.1.1 0 0 0-.077.164l4.631 5.558a1 1 0 0 1 .232.64v5.853a.1.1 0 0 0 .178.062l.781.625c-.65.812-1.959.353-1.959-.687V8.362L1.368 2.804C.771 2.088 1.281 1 2.214 1h11.573c.932 0 1.442 1.088.845 1.804L10 8.362v3.603a1.1 1.1 0 0 1-.241.687Z"
                       fill-rule="evenodd"
                     />
                   </svg>
@@ -2679,7 +2679,7 @@ exports[`<DefineDetector /> empty editing detector definition renders the compon
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                      d="m9.759 12.652-1.8 2.25-.78-.625 1.8-2.25A.1.1 0 0 0 9 11.965V8.362a1 1 0 0 1 .232-.64l4.631-5.558A.1.1 0 0 0 13.787 2H2.213a.1.1 0 0 0-.077.164l4.631 5.558a1 1 0 0 1 .232.64v5.853a.1.1 0 0 0 .178.062l.781.625c-.65.812-1.959.353-1.959-.687V8.362L1.368 2.804C.771 2.088 1.281 1 2.214 1h11.573c.932 0 1.442 1.088.845 1.804L10 8.362v3.603a1.1 1.1 0 0 1-.241.687Z"
                       fill-rule="evenodd"
                     />
                   </svg>

diff --git a/server/routes/opensearch.ts b/server/routes/opensearch.ts
@@ -570,14 +570,19 @@ export default class OpenSearchService {
 
       let clustersResponse: ClusterInfo[] = [];
 
-      const remoteInfo = await callWithRequest('transport.request', {
-        method: 'GET',
-        path: '/_remote/info',
-      });
-      clustersResponse = Object.keys(remoteInfo).map((key) => ({
-        name: key,
-        localCluster: false,
-      }));
+      try {
+        const remoteInfo = await callWithRequest('transport.request', {
+          method: 'GET',
+          path: '/_remote/info',
+        });
+        clustersResponse = Object.keys(remoteInfo).map((key) => ({
+          name: key,
+          localCluster: false,
+        }));
+      } catch (remoteErr) {
+        console.warn('Failed to fetch remote cluster info, proceeding with local datasource info only.', remoteErr);
+      }
+
 
       const clusterHealth = await callWithRequest('cat.health', {
         format: 'json',