From 3063bf7699166d1661c23ebd055d3060b4b4821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Mon, 29 Jun 2020 14:06:49 +0200
Subject: [PATCH] Avoid CCS-incompatible index name resolution

---
 .../http_api/log_sources/get_log_source_status.ts     |  2 +-
 .../public/containers/logs/log_source/log_source.ts   |  6 ------
 .../infra/public/pages/logs/stream/page_content.tsx   |  4 ++--
 .../infra/public/pages/logs/stream/page_providers.tsx |  4 ++--
 .../plugins/infra/server/routes/log_sources/status.ts | 11 +++++------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
index ae872cee9aa56..b522d86987283 100644
--- a/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
+++ b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
@@ -42,7 +42,7 @@ export type LogIndexField = rt.TypeOf<typeof logIndexFieldRT>;
 
 const logSourceStatusRT = rt.strict({
   logIndexFields: rt.array(logIndexFieldRT),
-  logIndexNames: rt.array(rt.string),
+  logIndicesExist: rt.boolean,
 });
 
 export type LogSourceStatus = rt.TypeOf<typeof logSourceStatusRT>;
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts b/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
index 80aab6237518f..b45ea0a042f49 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
@@ -78,11 +78,6 @@ export const useLogSource = ({
     [sourceId, fetch]
   );
 
-  /* eslint-disable-next-line react-hooks/exhaustive-deps */
-  const logIndicesExist = useMemo(() => (sourceStatus?.logIndexNames?.length ?? 0) > 0, [
-    sourceStatus,
-  ]);
-
   const derivedIndexPattern = useMemo(
     () => ({
       fields: sourceStatus?.logIndexFields ?? [],
@@ -160,7 +155,6 @@ export const useLogSource = ({
     loadSourceFailureMessage,
     loadSourceConfiguration,
     loadSourceStatus,
-    logIndicesExist,
     sourceConfiguration,
     sourceId,
     sourceStatus,
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
index 40ac5c74a6836..b2a4ce65ab2b6 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
@@ -18,14 +18,14 @@ export const StreamPageContent: React.FunctionComponent = () => {
     isUninitialized,
     loadSource,
     loadSourceFailureMessage,
-    logIndicesExist,
+    sourceStatus,
   } = useLogSourceContext();
 
   if (isLoading || isUninitialized) {
     return <SourceLoadingPage />;
   } else if (hasFailedLoadingSource) {
     return <SourceErrorPage errorMessage={loadSourceFailureMessage ?? ''} retry={loadSource} />;
-  } else if (logIndicesExist) {
+  } else if (sourceStatus?.logIndicesExist) {
     return <LogsPageLogsContent />;
   } else {
     return <LogsPageNoIndicesContent />;
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
index 428a7d3fdfe4b..82c21f663bc96 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
@@ -104,10 +104,10 @@ const LogHighlightsStateProvider: React.FC = ({ children }) => {
 };
 
 export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
-  const { logIndicesExist } = useLogSourceContext();
+  const { sourceStatus } = useLogSourceContext();
 
   // The providers assume the source is loaded, so short-circuit them otherwise
-  if (!logIndicesExist) {
+  if (!sourceStatus?.logIndicesExist) {
     return <>{children}</>;
   }
 
diff --git a/x-pack/plugins/infra/server/routes/log_sources/status.ts b/x-pack/plugins/infra/server/routes/log_sources/status.ts
index cdd053d2bb10a..4cd85ecfe23c1 100644
--- a/x-pack/plugins/infra/server/routes/log_sources/status.ts
+++ b/x-pack/plugins/infra/server/routes/log_sources/status.ts
@@ -31,17 +31,16 @@ export const initLogSourceStatusRoutes = ({
       const { sourceId } = request.params;
 
       try {
-        const logIndexNames = await sourceStatus.getLogIndexNames(requestContext, sourceId);
-        const logIndexFields =
-          logIndexNames.length > 0
-            ? await fields.getFields(requestContext, sourceId, InfraIndexType.LOGS)
-            : [];
+        const logIndicesExist = await sourceStatus.hasLogIndices(requestContext, sourceId);
+        const logIndexFields = logIndicesExist
+          ? await fields.getFields(requestContext, sourceId, InfraIndexType.LOGS)
+          : [];
 
         return response.ok({
           body: getLogSourceStatusSuccessResponsePayloadRT.encode({
             data: {
+              logIndicesExist,
               logIndexFields,
-              logIndexNames,
             },
           }),
         });