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.

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

Improve alpha messaging #64692

Merged
merged 22 commits into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3ddd775
use fixed table layout
Mar 25, 2020
ee9e0d3
Merge remote-tracking branch 'upstream/master'
Mar 26, 2020
01e5b24
Merge remote-tracking branch 'upstream/master'
Apr 9, 2020
0baf798
Merge remote-tracking branch 'upstream/master'
Apr 20, 2020
b400f4f
Merge remote-tracking branch 'upstream/master'
Apr 28, 2020
d2f103d
add alpha messaging flyout
Apr 28, 2020
0e1fbfd
Added alpha badge + data streams link
Apr 28, 2020
8ebc392
Merge remote-tracking branch 'upstream/master' into improve-alpha-mes…
Apr 28, 2020
2521887
Update x-pack/plugins/ingest_manager/public/applications/ingest_manag…
hbharding Apr 28, 2020
9437dfe
Update x-pack/plugins/ingest_manager/public/applications/ingest_manag…
hbharding Apr 28, 2020
1bb4d35
Update x-pack/plugins/ingest_manager/public/applications/ingest_manag…
hbharding Apr 28, 2020
a250a59
Update x-pack/plugins/ingest_manager/public/applications/ingest_manag…
hbharding Apr 28, 2020
ab88085
remove small tags
Apr 28, 2020
771153e
change messaging from alpha to experimental
Apr 28, 2020
70019b7
Merge branch 'master' into improve-alpha-messaging
elasticmachine Apr 28, 2020
06d8835
add period
Apr 29, 2020
7d7b0e2
Merge branch 'improve-alpha-messaging' of github.com:hbharding/kibana…
Apr 29, 2020
430805a
remove unused imports
Apr 29, 2020
32ddab6
Merge remote-tracking branch 'upstream/master' into improve-alpha-mes…
Apr 29, 2020
508eb68
fixed i18n ids
Apr 29, 2020
e28f08f
Merge remote-tracking branch 'upstream/master' into improve-alpha-mes…
Apr 29, 2020
c1d7845
Merge branch 'master' into improve-alpha-messaging
elasticmachine Apr 29, 2020
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React, { useState } from 'react';
import {
EuiCallOut,
EuiFlyout,
EuiFlyoutBody,
EuiFlyoutHeader,
EuiSpacer,
EuiTitle,
EuiIcon,
EuiText,
EuiTextColor,
EuiLink,
EuiFlexGroup,
EuiFlexItem,
EuiButtonEmpty,
EuiButton,
EuiFlyoutFooter,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

interface Props {
onClose: () => void;
}

export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
return (
<EuiFlyout onClose={onClose} size="m" maxWidth={640}>
<EuiFlyoutHeader hasBorder aria-labelledby="AlphaMessagingFlyoutTitle">
<EuiTitle size="m">
<h2 id="AlphaMessagingFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.flyoutTitle"
defaultMessage="About this release"
/>
</h2>
</EuiTitle>
</EuiFlyoutHeader>
<EuiFlyoutBody>
<EuiText size="m">
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.intro"
hbharding marked this conversation as resolved.
Show resolved Hide resolved
defaultMessage="This Alpha release is designed for users to test and offer feedback on the new Ingest
Manager and Elastic Agent. It is not intended for use in a production environments and
these features are not officially supported. We encourage you to read our {docsLink} or to ask for help and other feedback in our {forumLink}."
values={{
docsLink: (
<EuiLink href="https://ela.st/ingest-manager-docs" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.docsLink"
defaultMessage="documentation"
/>
</EuiLink>
),
forumLink: (
<EuiLink href="https://ela.st/ingest-manager-forum" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.forumLink"
defaultMessage="Discuss forum"
/>
</EuiLink>
),
}}
/>
</p>

<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.warning"
hbharding marked this conversation as resolved.
Show resolved Hide resolved
defaultMessage=" {note}: you should not store important data with Ingest Manager
hbharding marked this conversation as resolved.
Show resolved Hide resolved
since you will have limited visibility to it in a future release. This version uses an
indexing strategy that will be deprecated in the next release and there is no migration
path. Also, the licensing for features is under consideration and may change before our
GA release. As a result, you may lose access to certain features based on your license
tier."
values={{
note: (
<strong>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.warningNote"
defaultMessage="Please note"
/>
</strong>
),
}}
/>
</p>
</EuiText>
</EuiFlyoutBody>
<EuiFlyoutFooter>
<EuiButtonEmpty iconType="cross" onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.cancelButtonLabel"
defaultMessage="Close"
/>
</EuiButtonEmpty>
</EuiFlyoutFooter>
</EuiFlyout>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import React, { useState } from 'react';
import styled from 'styled-components';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiText } from '@elastic/eui';
import { EuiText, EuiLink } from '@elastic/eui';
import { AlphaFlyout } from './alpha_flyout';

const Message = styled(EuiText).attrs(props => ({
color: 'subdued',
Expand All @@ -15,23 +16,33 @@ const Message = styled(EuiText).attrs(props => ({
padding: ${props => props.theme.eui.paddingSizes.m};
`;

export const AlphaMessaging: React.FC<{}> = () => (
<Message>
<p>
<small>
<strong>
<FormattedMessage
id="xpack.ingestManager.alphaMessageTitle"
defaultMessage="Alpha release"
/>
</strong>
{' – '}
<FormattedMessage
id="xpack.ingestManager.alphaMessageDescription"
defaultMessage="Ingest Manager is under active development and is not
export const AlphaMessaging: React.FC<{}> = () => {
const [isAlphaFlyoutOpen, setIsAlphaFlyoutOpen] = useState<boolean>(false);

return (
<>
<Message>
<p>
<small>
hbharding marked this conversation as resolved.
Show resolved Hide resolved
<strong>
<FormattedMessage
id="xpack.ingestManager.alphaMessageTitle"
defaultMessage="Alpha release"
/>
</strong>
{' – '}
<FormattedMessage
id="xpack.ingestManager.alphaMessageDescription"
defaultMessage="Ingest Manager is under active development and is not
intended for production purposes."
/>
</small>
</p>
</Message>
);
/>{' '}
<EuiLink color="subdued" onClick={() => setIsAlphaFlyoutOpen(true)}>
View more details.
</EuiLink>
</small>
</p>
</Message>
{isAlphaFlyoutOpen && <AlphaFlyout onClose={() => setIsAlphaFlyoutOpen(false)} />}
</>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import styled from 'styled-components';
import {
EuiButton,
EuiButtonEmpty,
EuiBetaBadge,
EuiPanel,
EuiText,
EuiTitle,
Expand All @@ -19,10 +20,11 @@ import {
EuiFlexItem,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { WithHeaderLayout } from '../../layouts';
import { useLink, useGetAgentConfigs } from '../../hooks';
import { AgentEnrollmentFlyout } from '../fleet/agent_list_page/components';
import { EPM_PATH, FLEET_PATH, AGENT_CONFIG_PATH } from '../../constants';
import { EPM_PATH, FLEET_PATH, AGENT_CONFIG_PATH, DATA_STREAM_PATH } from '../../constants';

const OverviewPanel = styled(EuiPanel).attrs(props => ({
paddingSize: 'm',
Expand Down Expand Up @@ -57,6 +59,11 @@ const OverviewStats = styled(EuiDescriptionList).attrs(props => ({
}
`;

const AlphaBadge = styled(EuiBetaBadge)`
vertical-align: top;
margin-left: ${props => props.theme.eui.paddingSizes.s};
`;

export const IngestManagerOverview: React.FunctionComponent = () => {
// Agent enrollment flyout state
const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState<boolean>(false);
Expand All @@ -79,6 +86,18 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
id="xpack.ingestManager.overviewPageTitle"
defaultMessage="Ingest Manager"
/>
<AlphaBadge
label={i18n.translate('xpack.IngestManager.alphaBadge.label', {
defaultMessage: 'Alpha',
})}
title={i18n.translate('xpack.IngestManager.alphaBadge.title', {
defaultMessage: 'Alpha release',
})}
tooltipContent={i18n.translate('xpack.IngestManager.alphaBadge.title', {
hbharding marked this conversation as resolved.
Show resolved Hide resolved
defaultMessage:
'Ingest Manager is under active development and is not intended for production purposes.',
})}
/>
</h1>
</EuiText>
</EuiFlexItem>
Expand Down Expand Up @@ -213,7 +232,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
/>
</h2>
</EuiTitle>
<EuiButtonEmpty size="xs" flush="right">
<EuiButtonEmpty size="xs" flush="right" href={useLink(DATA_STREAM_PATH)}>
<FormattedMessage
id="xpack.ingestManager.overviewPageDataStreamsPanelAction"
defaultMessage="View data streams"
Expand Down