Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Logs UI] Avoid CCS-incompatible index name resolution #70179

Merged
merged 1 commit into from
Jul 1, 2020
Merged

[Logs UI] Avoid CCS-incompatible index name resolution #70179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
6 changes: 0 additions & 6 deletions x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?? [],
Expand Down Expand Up @@ -160,7 +155,6 @@ export const useLogSource = ({
loadSourceFailureMessage,
loadSourceConfiguration,
loadSourceStatus,
logIndicesExist,
sourceConfiguration,
sourceId,
sourceStatus,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}</>;
}

Expand Down
11 changes: 5 additions & 6 deletions x-pack/plugins/infra/server/routes/log_sources/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
});
Expand Down