uptime - handle index not found errors (elastic#142685)

kibanamachine · Oct 5, 2022 · 9ad4a71 · 9ad4a71
1 parent a2a2418
commit 9ad4a71
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/uptime/server/lib/lib.ts
@@ -93,7 +93,7 @@ export function createUptimeESClient({
             esError,
             esRequestParams: esParams,
             esRequestStatus,
-            esResponse: res.body,
+            esResponse: res?.body,
             kibanaRequest: request!,
             operationName: operationName ?? '',
             startTime: startTimeNow,

diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
@@ -11,18 +11,30 @@ import { StatesIndexStatus } from '../../../common/runtime_types';
 export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({
   uptimeEsClient,
 }) => {
-  const {
-    indices,
-    result: {
-      body: {
-        _shards: { total },
-        count,
+  try {
+    const {
+      indices,
+      result: {
+        body: {
+          _shards: { total },
+          count,
+        },
       },
-    },
-  } = await uptimeEsClient.count({ terminateAfter: 1 });
-  return {
-    indices,
-    indexExists: total > 0,
-    docCount: count,
-  };
+    } = await uptimeEsClient.count({ terminateAfter: 1 });
+    return {
+      indices,
+      indexExists: total > 0,
+      docCount: count,
+    };
+  } catch (e) {
+    if (e.meta.statusCode === 404) {
+      // we don't throw an error for index not found
+      return {
+        indices: '',
+        indexExists: false,
+        docCount: 0,
+      };
+    }
+    throw e;
+  }
 };