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

[Fleet] Add link to troubleshooting guide in confirm data copy #130420

Merged
merged 2 commits into from
Apr 19, 2022
Merged

[Fleet] Add link to troubleshooting guide in confirm data copy #130420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65033e3
Add link to troubleshooting guide in confirm data copy
jen-huang Apr 15, 2022
0fd4574
Merge branch 'main' into fix/troubleshooting-link
jen-huang Apr 19, 2022
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
25 changes: 19 additions & 6 deletions x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
*/

import React from 'react';
import { EuiCallOut, EuiText, EuiSpacer, EuiButton } from '@elastic/eui';
import { EuiCallOut, EuiText, EuiSpacer, EuiButton, EuiLink } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { i18n } from '@kbn/i18n';

import type { InstalledIntegrationPolicy } from './use_get_agent_incoming_data';
Expand All @@ -17,13 +18,15 @@ interface Props {
installedPolicy?: InstalledIntegrationPolicy;
agentDataConfirmed: boolean;
setAgentDataConfirmed: (v: boolean) => void;
troubleshootLink: string;
}

export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
agentIds,
installedPolicy,
agentDataConfirmed,
setAgentDataConfirmed,
troubleshootLink,
}) => {
const { incomingData, isLoading } = usePollingIncomingData(agentIds);

Expand All @@ -37,11 +40,21 @@ export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
}
if (!agentDataConfirmed) {
return (
<EuiText size="s">
{i18n.translate('xpack.fleet.confirmIncomingData.loading', {
defaultMessage:
'It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our troubleshooting guide. You may close this dialog and check later by viewing our integration assets.',
})}
<EuiText>
<FormattedMessage
id="xpack.fleet.confirmIncomingData.loading"
defaultMessage="It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our {link}. You may close this dialog and check later by viewing your integration assets."
values={{
link: (
<EuiLink target="_blank" external href={troubleshootLink}>
<FormattedMessage
id="xpack.fleet.enrollmentInstructions.troubleshootingLink"
defaultMessage="troubleshooting guide"
/>
</EuiLink>
),
}}
/>
</EuiText>
);
}
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
agentDataConfirmed,
setAgentDataConfirmed,
installedPolicy: installedPackagePolicy,
troubleshootLink: link,
})
);
}
Expand Down
3 changes: 3 additions & 0 deletions ...fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ export const IncomingDataConfirmationStep = ({
installedPolicy,
agentDataConfirmed,
setAgentDataConfirmed,
troubleshootLink,
}: {
agentIds: string[];
installedPolicy?: InstalledIntegrationPolicy;
agentDataConfirmed: boolean;
setAgentDataConfirmed: (v: boolean) => void;
troubleshootLink: string;
}): EuiContainedStepProps => {
return {
title: !agentDataConfirmed
Expand All @@ -41,6 +43,7 @@ export const IncomingDataConfirmationStep = ({
installedPolicy={installedPolicy}
agentDataConfirmed={agentDataConfirmed}
setAgentDataConfirmed={setAgentDataConfirmed}
troubleshootLink={troubleshootLink}
/>
) : null,
status: agentIds.length > 0 ? (!agentDataConfirmed ? 'loading' : 'complete') : 'disabled',
Expand Down