[7.8] [Logs UI] Avoid CCS-incompatible index name resolution (elastic…

…#70179) (elastic#70428) Backports the following commits to 7.8: - [Logs UI] Avoid CCS-incompatible index name resolution (elastic#70179)
liza-mae · Jul 2, 2020 · 12c7218 · 12c7218
1 parent 0b494b3
commit 12c7218
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 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
@@ -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
@@ -78,10 +78,6 @@ export const useLogSource = ({
     [sourceId, fetch]
   );
 
-  const logIndicesExist = useMemo(() => (sourceStatus?.logIndexNames?.length ?? 0) > 0, [
-    sourceStatus,
-  ]);
-
   const derivedIndexPattern = useMemo(
     () => ({
       fields: sourceStatus?.logIndexFields ?? [],
@@ -158,7 +154,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
@@ -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
@@ -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
@@ -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,
             },
           }),
         });